mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
345bc633cc
opencv/modules/superres
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 Super Resolution module 2013-02-27 13:41:15 +04:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
perf Merge pull request #1298 from jet47:gpu-eliminate-doubles 2013-08-20 18:04:54 +04:00
src Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00