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	Normalized file endings.	2013-08-21 18:59:25 +04:00
core	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
definitions	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-16 15:02:12 +04:00
features2d	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
general/table_of_content_general	Normalized file endings.	2013-08-21 18:59:25 +04:00
gpu	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
highgui	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-28 13:38:25 +04:00
ml	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
objdetect	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
photo	Docs updated, added InputArray, fixes for makePtr,...	2013-09-26 19:02:35 +04:00
video	fixing trailing whitespaces	2013-09-01 22:38:21 +02:00
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