mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
d8c9bb777e
opencv/cmake/templates
History
Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
..
cmake_uninstall.cmake.in Normalized file endings. 2013-08-21 18:59:25 +04:00
cvconfig.h.in Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +04:00
opencv_modules.hpp.in Normalized file endings. 2013-08-21 18:59:25 +04:00
opencv_run_all_tests_android.sh.in opencv_run_all_tests.sh implemented for Android SDK. 2014-02-12 14:21:58 +04:00
opencv_run_all_tests_unix.sh.in opencv_run_all_tests.sh implemented for Android SDK. 2014-02-12 14:21:58 +04:00
opencv_testing.sh.in Multiple fixes for tests deb package build. 2014-01-28 16:32:26 +04:00
opencv-XXX.pc.in Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
OpenCV.mk.in Added guard to prevent from gpu module redefinition in OpenCV.mk 2014-03-22 05:41:29 +04:00
OpenCVConfig-version.cmake.in Updated the build config files to deal with the version status. 2013-09-12 16:37:30 +04:00
OpenCVConfig.cmake.in Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +04:00