generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9218f4976c
opencv/modules/gpuoptflow/perf
History
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
perf_main.cpp fixed gpu performance tests: 2013-07-16 15:43:04 +04:00
perf_optflow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-02 19:44:51 +04:00
perf_precomp.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
perf_precomp.hpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00