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
..
2013-07-03 21:32:15 +04:00
2013-06-14 17:25:57 +04:00
2013-06-18 08:36:49 +04:00