Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename ... Conflicts: modules/core/include/opencv2/core/cuda.hpp modules/cudacodec/src/thread.cpp modules/cudacodec/src/thread.hpp modules/superres/perf/perf_superres.cpp modules/superres/src/btv_l1_cuda.cpp modules/superres/src/optical_flow.cpp modules/videostab/src/global_motion.cpp modules/videostab/src/inpainting.cpp samples/cpp/stitching_detailed.cpp samples/cpp/videostab.cpp samples/gpu/stereo_multi.cpp		2013-09-06 15:44:44 +04:00
..
android_lib	Merge pull request #800 from asmorkalov:android_cam_idx_semantic	2013-04-29 10:00:08 +04:00
android_test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
generator	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	fix for #3077	2013-06-14 20:25:23 +04:00