generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8b19df3fec
opencv/cmake/templates
History
Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
..
cmake_uninstall.cmake.in Normalized file endings. 2013-08-21 18:59:25 +04:00
cvconfig.h.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-22 14:28:00 +04:00
opencv_modules.hpp.in Normalized file endings. 2013-08-21 18:59:25 +04:00
opencv-XXX.pc.cmake.in Updated the build config files to deal with the version status. 2013-09-12 16:37:30 +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-10-28 13:38:25 +04:00