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

..

doc

fixed docs

2013-09-02 14:00:44 +04:00

include/opencv2

renamed gpufilters -> cudafilters

2013-09-02 14:00:43 +04:00

perf

removed precomp.cpp files

2013-09-02 14:00:44 +04:00

src

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

test

removed precomp.cpp files

2013-09-02 14:00:44 +04:00

CMakeLists.txt

renamed gpufilters -> cudafilters

2013-09-02 14:00:43 +04:00