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
..
2011-05-09 16:20:46 +00:00
2013-01-25 16:30:36 +04:00
2013-06-10 15:52:01 +04:00
2011-07-08 14:34:03 +00:00
2013-04-12 15:35:38 +04:00
2013-05-27 11:10:38 +04:00
2012-08-07 13:22:41 +04:00