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	refactored generalized hough (both CPU and GPU):	2013-07-18 15:17:33 +04:00
perf	Merge pull request #1149 from jet47:generalized-hough-refactoring	2013-08-14 13:26:24 +04:00
src	Merge pull request #1149 from jet47:generalized-hough-refactoring	2013-08-14 13:26:24 +04:00
test	Merge pull request #1149 from jet47:generalized-hough-refactoring	2013-08-14 13:26:24 +04:00
CMakeLists.txt	made dependecy from gpufilters optional	2013-07-17 11:40:00 +04:00