Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 31 Jan 2013 10:35:27 +0000 (14:35 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 31 Jan 2013 10:35:27 +0000 (14:35 +0400)
commit57d3152cd0e0d0ba3221e33a5981366d8b45be5a
treee90b8792763869a0562d7ac6711a5002c949f2ec
parent7572b4d4003f7cf7249264bc78e552b325425393
parent53b0df87f1e9f0b06dcd0dcc99310195f3bbebb2
Merge branch '2.4'
modules/highgui/src/window_QT.cpp
modules/imgproc/test/test_houghLines.cpp
modules/nonfree/test/test_features2d.cpp