mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6d64907f18
opencv/modules/highgui
History
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
..
doc Doc fix. 2014-01-16 16:30:54 +02:00
include/opencv2 Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect() 2014-01-16 11:09:25 +02:00
perf Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
src Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2 2014-01-20 14:15:05 +04:00
test deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00