Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype

This commit is contained in:
Peng Xiao 2013-04-13 14:09:21 +08:00
commit f2dc445412

Diff Content Not Available