Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp

2013-07-22 18:38:57 +04:00

..

doc

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

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

include/opencv2

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

2013-07-22 18:38:57 +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

Changed / for Matx to Matx::div, for symmetry with Matx::mul.

2013-07-16 12:25:26 +04:00

CMakeLists.txt

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

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