Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
android	Adjusted the camera calibration sample to master API.	2013-08-13 14:55:27 +04:00
c	Compile OpenCV with GCC visibility set to hidden	2013-05-13 18:33:20 +04:00
cpp	Merge pull request #1079 from AlexeySpizhevoy:master	2013-08-05 10:54:44 +04:00
gpu	Merge pull request #1149 from jet47:generalized-hough-refactoring	2013-08-14 13:26:24 +04:00
java	fixing issues from http://www.code.opencv.org/issues/2807	2013-02-28 19:11:24 +04:00
MacOSX/FaceTracker	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ocl	Fix the problem of haar caused by merge	2013-07-22 17:53:56 +08:00
python2	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
winrt/ImageManipulations	Path to OpenCV dll libs fixes.	2013-06-28 16:48:27 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00