mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
591b1a7e70
opencv/modules/softcascade/src
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
..
cuda renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
cuda_invoker.hpp renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
detector_cuda.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
detector.cpp War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
integral_channel_builder.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
octave.cpp War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
precomp.hpp renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
softcascade_init.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00