Andrey Kamaev 956aa68fb5 Merge branch '2.4'		2013-02-12 20:30:17 +04:00
..
app/nv_perf_test	warnings, renamed Marina's GPU_PERF_TEST_P	2012-12-25 22:00:20 +04:00
doc	Merge branch '2.4'	2013-02-12 16:30:18 +04:00
include/opencv2/gpu	Merge pull request #372 from cuda-geek:gpu-cascade-fixes	2013-01-31 20:13:31 +04:00
misc	fixed build for CARMA:	2013-01-23 21:05:08 +04:00
perf	fix tests	2013-01-30 15:55:04 +04:00
src	Merge branch '2.4'	2013-02-12 20:30:17 +04:00
test	fix tests	2013-01-30 15:55:04 +04:00
CMakeLists.txt	fixed build for CARMA:	2013-01-23 21:05:08 +04:00