Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +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-08-19 19:02:36 +04:00
gen_java.py	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +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