Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
pics	added pictures for OpenCV 2.x reference manual; fixed some build problems and done some more cleanup work	2011-03-05 21:26:13 +00:00
highgui.rst	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
qt_new_functions.rst	Update documentation	2013-04-08 15:47:29 +04:00
reading_and_writing_images_and_video.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
user_interface.rst	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00