• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · bbc35d60
    Roman Donchenko authored
    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
    bbc35d60
Name
Last commit
Last update
..
android Loading commit data...
ios Loading commit data...
linux Loading commit data...
scripts Loading commit data...
winrt Loading commit data...
readme.txt Loading commit data...
This folder contains toolchains and additional files that are needed for cross compilation.
For more information see introduction tutorials for target platform in documentation:
http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction