Roman Donchenko 556028eff5 Merge pull request #1253 from kamjagin:fixingCompilationOnOSX		2013-08-15 11:54:55 +04:00
..
doc	Fixed documentation errors.	2013-08-06 18:07:08 +04:00
include/opencv2	Merge pull request #1253 from kamjagin:fixingCompilationOnOSX	2013-08-15 11:54:55 +04:00
perf	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
src	Merge pull request #1162 from jet47:cudev-integration	2013-08-14 12:00:34 +04:00
test	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
CMakeLists.txt	Merge pull request #1162 from jet47:cudev-integration	2013-08-14 12:00:34 +04:00