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

..

config

Move cv::Matx and cv::Vec to separate header

2013-04-01 15:24:33 +04:00

src

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

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

gen_java.py

fixing Java wrapper for mixChannels

2013-06-10 14:37:01 +04:00

gen_javadoc.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

rst_parser.py

Remove documentation for old python wrapper

2013-04-12 19:37:40 +04:00