mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-30 21:25:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
0934344a3d
opencv/modules/superres/include
History
Roman Donchenko feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
..
opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00