Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt

2014-02-25 15:02:24 +04:00

..

doc

fix documentation

2013-09-02 14:00:44 +04:00

include/opencv2

ported superres to T-API

2014-02-01 17:20:18 +04:00

perf

ported superres to T-API

2014-02-01 17:20:18 +04:00

src

added perf test

2014-02-05 20:24:30 +04:00

test

ported superres to T-API

2014-02-01 17:20:18 +04:00

CMakeLists.txt

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

2014-02-25 15:02:24 +04:00