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

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

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

include/opencv2

setting version to 2.4.6.1 (hot-fix release for Linux camera support)

2013-07-10 15:12:39 +04:00

perf

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

src

Merge pull request #1081 from SpecLad:merge-2.4

2013-07-05 13:34:59 +04:00

test

Removed misleading comment and added the divisibility test to ::run function.

2013-06-26 12:16:25 -04:00

CMakeLists.txt

Automatically add CUDA support to a module if it has CUDA sources.

2013-04-10 12:20:54 +04:00