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 |
|
Alexander Smorkalov
|
b75cbfde45
|
All installed files marked with component names for install customization.
|
2014-01-21 20:34:36 +04:00 |
|
Roman Donchenko
|
615d6c22d1
|
Switched OpenCV to a 3-component version number.
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
|
2013-11-15 19:41:53 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Alexander Smorkalov
|
20fef00a77
|
android -> plarforms/android
|
2013-05-27 11:10:38 +04:00 |
|