Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 27 Jan 2014 11:28:14 +0000 (15:28 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 27 Jan 2014 11:28:14 +0000 (15:28 +0400)
commitbbc35d609d5613c73c9597502f13ceeb97dc769b
treec4c9c33c28e74a4b8ddf16b0f4593fca90f9a9e6
parent06acf7090cbc33e364ab0b65011295f0ab714988
parentd093cb54d5253608fce72ede183b5b0c196363b2
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
25 files changed:
3rdparty/libjasper/CMakeLists.txt
3rdparty/libjpeg/CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
3rdparty/openexr/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
CMakeLists.txt
apps/haartraining/CMakeLists.txt
apps/traincascade/CMakeLists.txt
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
doc/CMakeLists.txt
modules/core/src/cuda/gpu_mat.cu
modules/core/src/system.cpp
modules/highgui/CMakeLists.txt
modules/java/CMakeLists.txt
modules/ocl/perf/perf_haar.cpp
modules/python/CMakeLists.txt
samples/c/CMakeLists.txt
samples/cpp/CMakeLists.txt
samples/gpu/CMakeLists.txt
samples/gpu/performance/CMakeLists.txt
samples/ocl/CMakeLists.txt