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
..
doc	Super Resolution module	2013-02-27 13:41:15 +04:00
include/opencv2	Drop cv:: prefix from cv::String used inside the cv namespace	2013-03-22 22:14:50 +04:00
perf	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	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
CMakeLists.txt	Super Resolution module	2013-02-27 13:41:15 +04:00