Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp

2013-07-08 18:47:38 +04:00

..

ocl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-08 18:47:38 +04:00

ocl.hpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00