alexandre benoit 72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process		2013-04-29 19:06:35 +02:00
..
calib3d	calib3d model superscript should be subscript	2013-03-15 00:29:46 -03:00
contrib	resolved conflicts, updated retina class interface and optimized a heavy retinacolor process	2013-04-29 19:06:35 +02:00
core	Minimize usages of legacy C API inside the library	2013-04-16 12:00:02 +04:00
definitions	minor chnges for conflict removal	2013-04-29 15:12:44 +02:00
features2d	Merge branch '2.4'	2013-04-05 21:11:59 +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	Main module headers are moved 1 level up	2013-03-13 17:26:56 +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	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
introduction	Minimize usages of legacy C API inside the library	2013-04-16 12:00:02 +04:00
ios	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ml	fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)	2012-10-31 15:15:51 +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