Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 22 Jul 2013 14:38:57 +0000 (18:38 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 22 Jul 2013 14:38:57 +0000 (18:38 +0400)
commit3939d783362a252e4e43e81db9c1dfb3e8c78217
tree863cba3a11a482fca71162a701bac3ec12217e15
parentef91d7e8830c36785f0b6fdbf2045da48413dd76
parent38a0b47b2fe250d858537e73a850ea27a44a4a66
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
15 files changed:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst
modules/contrib/src/ba.cpp
modules/contrib/src/featuretracker.cpp
modules/core/include/opencv2/core/cvdef.h
modules/features2d/src/bagofwords.cpp
modules/highgui/src/cap_qtkit.mm
modules/imgproc/src/distransform.cpp
modules/imgproc/src/histogram.cpp
modules/imgproc/src/shapedescr.cpp
modules/java/generator/src/cpp/Mat.cpp
modules/java/generator/src/java/core+MatOfDMatch.java
modules/java/generator/src/java/core+MatOfKeyPoint.java
modules/python/src2/cv2.cpp
modules/ts/src/ts_perf.cpp