Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Mar 2013 14:50:19 +0000 (18:50 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Mar 2013 14:50:19 +0000 (18:50 +0400)
commit9b7dfd677db5818b8dd699e2059c886a1e7ce24f
tree7491ad8da8944d5f0f5056c1a74a0f39bf445e47
parent9b8c8718749077fae422dc817787e361bb935d12
parent980fc93b4d3a87b38ec3975db2a5214331c38dda
Merge branch '2.4'
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/imgproc/perf/perf_cvt_color.cpp
modules/imgproc/src/color.cpp
modules/imgproc/test/test_cvtyuv.cpp
modules/python/src2/cv2.cpp