Andrey Kamaev 91f47d2779 Merge branch '2.4' ... Conflicts: modules/core/include/opencv2/core/version.hpp		2012-10-23 20:39:02 +04:00
..
calib3d	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
core	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
definitions	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
features2d	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +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	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
highgui	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
images	added ios tutorials by Charu Hans and Eduard Feicho	2012-08-30 15:49:53 +04:00
imgproc	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
introduction	Merge branch '2.4'	2012-10-23 20:39:02 +04:00
ios	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ml	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
objdetect	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
video/table_of_content_video	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
tutorials.rst	added ios tutorials by Charu Hans and Eduard Feicho	2012-08-30 15:49:53 +04:00