Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp		2014-03-03 13:45:22 +04:00
..
calib3d
core
definitions
features2d
general/table_of_content_general
gpu
highgui
images	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00
imgproc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00
introduction	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
ios
ml
objdetect
photo
video
viz	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00
tutorials.rst	removed TOC	2014-01-21 18:47:22 +04:00