Lars Glud 4dcd37f699 Merge remote-tracking branch 'origin/master' into Openni2Support ...

Conflicts:
	modules/highgui/CMakeLists.txt
	modules/highgui/include/opencv2/highgui.hpp
	modules/highgui/include/opencv2/highgui/highgui_c.h

2014-07-20 14:28:10 +02:00

..

cmake_uninstall.cmake.in

Normalized file endings.

2013-08-21 18:59:25 +04:00

cvconfig.h.in

Openni2 support

2014-07-16 12:37:53 +02: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

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00