Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/gpuwarping/src/cuda/resize.cu modules/gpuwarping/src/resize.cpp modules/gpuwarping/test/test_resize.cpp modules/ocl/perf/main.cpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_canny.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_haar.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/perf/perf_precomp.cpp modules/ocl/perf/perf_precomp.hpp		2013-08-27 19:15:47 +04:00
..
checks
templates	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
cl2cpp.cmake
OpenCVCompilerOptions.cmake	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
OpenCVCRTLinkage.cmake	Fix errors in usages of try_compile	2013-08-22 15:56:35 +04:00
OpenCVDetectAndroidSDK.cmake
OpenCVDetectApacheAnt.cmake
OpenCVDetectCStripes.cmake
OpenCVDetectCUDA.cmake
OpenCVDetectCXXCompiler.cmake
OpenCVDetectOpenCL.cmake
OpenCVDetectPython.cmake	Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.	2013-08-23 18:48:08 +04:00
OpenCVDetectTBB.cmake
OpenCVExtraTargets.cmake
OpenCVFindIPP.cmake
OpenCVFindLATEX.cmake
OpenCVFindLibsGrfmt.cmake	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
OpenCVFindLibsGUI.cmake	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
OpenCVFindLibsPerf.cmake	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
OpenCVFindLibsVideo.cmake	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
OpenCVFindOpenEXR.cmake
OpenCVFindOpenNI.cmake
OpenCVFindWebP.cmake
OpenCVFindXimea.cmake
OpenCVGenAndroidMK.cmake
OpenCVGenConfig.cmake
OpenCVGenHeaders.cmake
OpenCVGenInfoPlist.cmake
OpenCVGenPkgconfig.cmake
OpenCVMinDepVersions.cmake	Bumped minimal Python version to 2.6.	2013-08-23 18:46:54 +04:00
OpenCVModule.cmake
OpenCVPCHSupport.cmake
OpenCVUtils.cmake	Fix errors in usages of try_compile	2013-08-22 15:56:35 +04:00
OpenCVVersion.cmake