opencv

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

doc

Super Resolution module

2013-02-27 13:41:15 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-16 11:52:41 +04:00

perf

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-16 11:52:41 +04:00

src

Merge remote-tracking branch 'origin/2.4' into merge-2.4