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
..
calib3d	Fix bug with indices	2013-06-14 13:12:35 +04:00
contrib	updated sources to correct buildbot warnings	2013-04-30 17:32:47 +02:00
core	Minimize usages of legacy C API inside the library	2013-04-16 12:00:02 +04:00
definitions	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
features2d	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
general/table_of_content_general	1) Converted all images to JPG to reduce size.	2011-07-19 22:08:54 +00:00
gpu	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
highgui	Minimize usages of legacy C API inside the library	2013-04-16 12:00:02 +04:00
images	adding retina tutorial	2012-10-30 15:06:13 +04:00
imgproc	fix parenthesis	2013-05-22 13:57:43 +03:00
introduction	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-08 18:47:38 +04:00
ios	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ml	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
objdetect	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
video/table_of_content_video	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
tutorials.rst	updated tutorial, rapid spell check, retina parameters discussion added	2012-10-30 15:06:13 +04:00