Merge commit '4b885e206' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)
commit9dfb96389c485af9db60c10a45c2ba342a1d979c
tree17d0ee1eeef43c48bdcb1c6b0fa0195b52e0ce4a
parentd61150984242938ca836f3a0ea129d946bfc58ec
parent4b885e20677191ac6c285cf0220c8a5a9c544326
Merge commit '4b885e206' into merge-2.4
modules/highgui/src/window_w32.cpp
modules/imgproc/doc/feature_detection.rst
modules/imgproc/src/color.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/haar.cpp
modules/python/src2/cv2.cpp