mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
0c7663eb3b
opencv/modules/python/src2
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
..
cv2.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
gen2.py Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hdr_parser.py Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
pycompat.hpp Updated cv2.cpp to support Python 3 API. 2013-06-13 20:10:01 -04:00