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

pull/811/head
Peng Xiao 12 years ago
commit f2dc445412

Diff Content Not Available