opencv/cmake/templates
Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +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