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
..
clp.hpp
deblurring.cpp
fast_marching.cpp
frame_source.cpp
global_motion.cpp
inpainting.cpp
log.cpp
motion_stabilizing.cpp
optical_flow.cpp
outlier_rejection.cpp
precomp.hpp
stabilizer.cpp
wobble_suppression.cpp