Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Feb 2013 10:58:52 +0000 (14:58 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Feb 2013 10:59:40 +0000 (14:59 +0400)
commit61079547f01b19aea037d2b878c2e0204b718f32
tree762408111828c600ce5d441e2927b0724458a1d6
parentd874d93e24ca22b09c331697e2644a012dad7f34
parentb179e2dd2d44163a35f21330e874e52e4976e580
Merge branch '2.4'
12 files changed:
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/calib3d/src/modelest.cpp
modules/core/doc/drawing_functions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/matrix.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/features2d_init.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/imgproc/perf/perf_cvt_color.cpp
modules/imgproc/perf/perf_resize.cpp
modules/ts/src/ts_perf.cpp
modules/video/doc/motion_analysis_and_object_tracking.rst