mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
e844c08203
opencv/cmake/templates
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +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 2013-12-23 18:50:17 +04:00
opencv_modules.hpp.in Normalized file endings. 2013-08-21 18:59:25 +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 Build with OpenCV.mk for all terget fixed. 2013-02-28 21:43:57 +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 2013-11-26 15:05:26 +04:00