mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-30 13:08:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2bb3de5aa0
opencv/cmake/templates
History
Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +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-11-19 16:21:09 +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