Roman Donchenko bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectPython.cmake cmake/OpenCVModule.cmake modules/core/src/gpumat.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/CMakeLists.txt modules/gpu/src/cuda/generalized_hough.cu modules/gpu/src/generalized_hough.cpp modules/python/CMakeLists.txt		2014-01-27 15:28:14 +04:00
..
res	android -> plarforms/android	2013-05-27 11:10:38 +04:00
AndroidManifest.xml	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
CMakeLists.txt	All installed files marked with component names for install customization.	2014-01-21 20:34:36 +04:00