Roman Donchenko 9b7e77ccda Merge commit '83cdd43a' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp		2013-12-30 16:36:35 +04:00
..
config	Move cv::Matx and cv::Vec to separate header	2013-04-01 15:24:33 +04:00
src	Merge commit '83cdd43a' into merge-2.4	2013-12-30 16:36:35 +04:00
gen_java.py	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
gen_javadoc.py	Fixed the shebang lines on the Python scripts.	2013-04-11 18:37:23 +04:00
rst_parser.py	fix documentation	2013-09-02 14:00:44 +04:00