Merge pull request #3194 from stonier:2.4

faed8f43 · Vadim Pisarevsky · 9a15c7a8 · 161f5096 · faed8f43
Commit faed8f43 authored Sep 09, 2014 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

window_QT.cpp modules/highgui/src/window_QT.cpp +0 -0

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp