Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
doc	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
include/opencv2	Merge pull request #1149 from jet47:generalized-hough-refactoring	2013-08-14 13:26:24 +04:00
perf	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
src	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
test	Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2	2013-08-12 10:04:15 +02:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00