Roman Donchenko 4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp

2013-07-03 19:53:21 +04:00

..

checks

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

templates

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

cl2cpp.cmake

discard comments in kernels.cpp

2013-03-26 12:01:01 +08:00

CMakeParseArguments.cmake

minor fix in FindTBB

2012-08-23 13:37:27 +04:00

OpenCVCompilerOptions.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

OpenCVConfig.cmake

Advance version number to 2.4.3-rc

2012-10-23 17:59:59 +04:00

OpenCVCRTLinkage.cmake

Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration

2012-03-02 14:48:35 +00:00

OpenCVDetectAndroidSDK.cmake

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

OpenCVDetectApacheAnt.cmake

Fix ant/Java detection in cmake scripts

2013-03-29 18:29:40 +04:00

OpenCVDetectCStripes.cmake

fixed C= detection script

2012-10-10 16:15:27 +04:00

OpenCVDetectCUDA.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

OpenCVDetectCXXCompiler.cmake

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

OpenCVDetectOpenCL.cmake

Fix cmake path finding for amd libs.

2013-06-19 11:31:42 +08:00

OpenCVDetectPython.cmake

Updated cmake files to use print().

2013-06-13 20:10:01 -04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

2013-02-06 14:43:57 +04:00

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

2013-03-25 21:57:53 +04:00

OpenCVFindIPP.cmake

fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!)

2012-10-08 22:00:25 +04:00

OpenCVFindLATEX.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindLibsGrfmt.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsGUI.cmake

Pass the HAVE_QT* flags through the config header, like all others.

2013-06-19 17:44:12 +04:00

OpenCVFindLibsPerf.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsVideo.cmake

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

OpenCVFindOpenEXR.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindOpenNI.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindPkgConfig.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindWebP.cmake

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

OpenCVFindXimea.cmake

Fixed Ximea cameras support

2013-06-11 21:17:31 +04:00

OpenCVGenAndroidMK.cmake

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

2013-02-22 11:57:42 +04:00

OpenCVGenConfig.cmake

android -> plarforms/android

2013-05-27 11:10:38 +04:00

OpenCVGenHeaders.cmake

Fixed linux and android install

2012-06-27 13:52:29 +00:00

OpenCVGenPkgconfig.cmake

Fixed linux and android install

2012-06-27 13:52:29 +00:00

OpenCVLegacyOptions.cmake

Code review notes fixed.

2013-04-03 04:14:40 -07:00

OpenCVModule.cmake

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

OpenCVPCHSupport.cmake

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

OpenCVUtils.cmake

Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

2013-06-14 15:46:25 +04:00

OpenCVVersion.cmake

Consistently use 4-digit library version

2013-01-18 14:57:55 +04:00