Hilton Bristow 72d5609a36 Merged upstream master		2014-03-04 11:14:03 +10: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	2014-03-03 13:45:22 +04:00
gen_java.py	fixes for defects from code coverity	2014-01-28 20:24:10 +04:00
gen_javadoc.py	Fixed the shebang lines on the Python scripts.	2013-04-11 18:37:23 +04:00
rst_parser.py	Merged upstream master	2014-03-04 11:14:03 +10:00