Roman Donchenko 10340fe234 Merge pull request #949 from SpecLad:merge-2.4		2013-06-07 12:45:03 +04:00
..
doc	Updated documentation to new "COLOR_" format for color conversion enums.	2013-06-05 21:59:01 -04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
perf	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
src	Merge remote-tracking branch 'origin/2.4'	2013-05-21 17:19:23 +04:00
test	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
CMakeLists.txt	Automatically add CUDA support to a module if it has CUDA sources.	2013-04-10 12:20:54 +04:00