Roman Donchenko beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4		2013-08-20 14:10:22 +04:00
..
doc	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
include/opencv2	renamed gpu headers (made it more consistent)	2013-06-10 12:40:30 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
test	Merge pull request #1297 from SpecLad:merge-2.4	2013-08-20 14:10:22 +04:00
CMakeLists.txt	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00