opencv

History

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

bioinspired

retina included in namespace bioinspired + followed suggestions made by Vadim

2013-07-14 19:28:37 +02:00

calib3d

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

core

Merge branch 'master' into gpu-cuda-rename

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

features2D

Merge remote-tracking branch 'origin/2.4'