mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
af74ec6044
opencv/modules/gpu
History
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
doc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
include/opencv2 Normalized file endings. 2013-08-21 18:59:25 +04:00
misc Normalized file endings. 2013-08-21 18:59:25 +04:00
perf Merge pull request #1215 from jet47:cuda-5.5-sanity 2013-08-21 13:25:28 +04:00
perf4au Normalized file endings. 2013-08-21 18:59:25 +04:00
src Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
CMakeLists.txt Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00