Merge commit '1644eeece07040927ced5628e3922774576c64c9' into master-merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/multimon.cpp
index 869bc1d86690b28c1eb9d723fe0a9d8cdefaa6ab,abde2ec234331ffe331d6b4b3b3c96248530bbd0..f7c7006fcf14f42bb7b618a9d13ff7145791f477
--- 1/radiant/multimon.cpp
--- 2/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@@ -33,11 -33,11 +33,11 @@@ multimon_globals_t g_multimon_globals
  
  void MultiMonitor_constructPreferences( PreferencesPage& page ){
        ui::CheckButton primary_monitor = page.appendCheckBox( "Multi Monitor", "Start on Primary Monitor", g_multimon_globals.m_bStartOnPrimMon );
-       ui::CheckButton popup = page.appendCheckBox(
-               "", "Disable system menu on popup windows",
-               make_property( g_Multimon_enableSysMenuPopups )
-               );
-       Widget_connectToggleDependency( popup, primary_monitor );
+ //    ui::CheckButton popup = page.appendCheckBox(
+ //            "", "Disable system menu on popup windows",
 -//            mkImportExportCallback( g_Multimon_enableSysMenuPopups )
++//            make_property( g_Multimon_enableSysMenuPopups )
+ //            );
+ //    Widget_connectToggleDependency( popup, primary_monitor );
  }
  
  #include "preferencesystem.h"

diff --cc radiant/xywindow.cpp
Simple merge