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

Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp

2013-07-08 18:47:38 +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-08 18:47:38 +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