Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/retina.cpp modules/gpu/perf/perf_video.cpp modules/gpuoptflow/src/tvl1flow.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/precomp.hpp samples/gpu/stereo_multi.cpp		2013-09-02 19:44:51 +04:00
..
doc	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
include/opencv2	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
test	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00