third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2d6f35d6ed
opencv/samples
History
Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
..
android Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
c War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
cpp War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +04:00
gpu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
java Normalized file endings. 2013-08-21 18:59:25 +04:00
MacOSX/FaceTracker Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
ocl Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
python2 War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +04:00
winrt/ImageManipulations Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
CMakeLists.txt add an ocl sample 2012-08-08 17:12:53 +08:00