Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +04:00
parent d611509842 4b885e2067
commit 9dfb96389c
8 changed files with 18 additions and 515 deletions
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -61,7 +61,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
 #endif
-#include <MultiMon.h>

 #include <commctrl.h>
 #include <winuser.h>