Andrey Kamaev 8c41c614eb Merge pull request #700 from cuda-geek/fix_build_with_cuda ... fix master build with CUDA after latest 2.4 merge		2013-03-25 03:27:31 -07:00
..
app/nv_perf_test	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
doc	Update documentation	2013-03-22 22:14:54 +04:00
include/opencv2	Drop cv:: prefix from cv::String used inside the cv namespace	2013-03-22 22:14:50 +04:00
misc	removed obsolete CARMA toolchain and CMake variable	2013-02-14 16:27:17 +04:00
perf	Merge pull request #680 from vpisarev:c2cpp_video_take2	2013-03-22 19:34:53 +04:00
perf4au	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
src	Merge pull request #700 from cuda-geek/fix_build_with_cuda	2013-03-25 03:27:31 -07:00
test	fix build gpu tests after video module refactoring	2013-03-25 09:34:51 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-03-21 23:11:54 +04:00