Merge commit 'ce0ea4bdc1521a3926994077fc104e7a155d299d' into master-merge

diff --cc plugins/shaders/shaders.cpp
Simple merge

diff --cc radiant/gtkdlgs.cpp
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/mru.cpp
index 640fd3914ca94e1f3f9ec7a77d3f9c5e9c1d66af,72660b91109b45a223e403829712ca4d1ae66dc6..709876482dd4621afbfab24bf0dd034912b3cbcf
--- 1/radiant/mru.cpp
--- 2/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@@ -49,30 -50,28 +49,30 @@@ inline const char* MRU_GetText( std::si
  
  class EscapedMnemonic
  {
 -StringBuffer m_buffer;
 +private:
 +      std::string m_buffer;
 +
  public:
 -EscapedMnemonic( std::size_t capacity ) : m_buffer( capacity ){
 +      EscapedMnemonic() : m_buffer(){
-               m_buffer.push_back( '_' );
-       }
-       const char* c_str() const {
-               return m_buffer.c_str();
-       }
-       void push_back( char c ){ // not escaped
-               m_buffer.push_back( c );
-       }
-       std::size_t write( const char* buffer, std::size_t length ){
-               for ( const char* end = buffer + length; buffer != end; ++buffer )
-               {
-                       if ( *buffer == '_' ) {
-                               m_buffer.push_back( '_' );
-                       }
- 
-                       m_buffer.push_back( *buffer );
+       m_buffer.push_back( '_' );
+ }
+ const char* c_str() const {
+       return m_buffer.c_str();
+ }
+ void push_back( char c ){ // not escaped
+       m_buffer.push_back( c );
+ }
+ std::size_t write( const char* buffer, std::size_t length ){
+       for ( const char* end = buffer + length; buffer != end; ++buffer )
+       {
+               if ( *buffer == '_' ) {
+                       m_buffer.push_back( '_' );
                }
-               return length;
+ 
+               m_buffer.push_back( *buffer );
        }
+       return length;
+ }
  };
  
  template<typename T>
@@@ -174,18 -173,16 +174,18 @@@ void MRU_Activate( std::size_t index )
  
  class LoadMRU
  {
-       std::size_t m_number;
 +private:
+ std::size_t m_number;
 +
  public:
-       LoadMRU( std::size_t number )
-               : m_number( number ){
-       }
-       void load(){
-               if ( ConfirmModified( "Open Map" ) ) {
-                       MRU_Activate( m_number - 1 );
-               }
+ LoadMRU( std::size_t number )
+       : m_number( number ){
+ }
+ void load(){
+       if ( ConfirmModified( "Open Map" ) ) {
+               MRU_Activate( m_number - 1 );
        }
+ }
  };
  
  typedef MemberCaller<LoadMRU, void(), &LoadMRU::load> LoadMRUCaller;

diff --cc radiant/preferences.cpp
index 7372a74a0adc30167b185f54f9a0b745cdef52ce,7299a3f9dcc4c354b698c2cdc618aa144b7c5873..f308ebcf1e78226f80933ddb5f9439528b1372d9
--- 1/radiant/preferences.cpp
--- 2/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@@ -279,18 -281,7 +279,18 @@@ void CGameDialog::GameFileImport( int v
        {
                ++iGame;
        }
-               m_sGameFile = ( *iGame )->mGameFile;
 +
 +      if ( ( *iGame )->mGameFile != m_sGameFile ) {
+       m_sGameFile = ( *iGame )->mGameFile;
 +
 +              // do not trigger radiant restart when switching game on startup using Global Preferences dialog
 +              if ( !onStartup ) {
 +                      PreferencesDialog_restartRequired( "Selected Game" );
 +              }
 +      }
 +
 +      // onStartup can only be true once, when Global Preferences are displayed at startup
 +      onStartup = false;
  }
  
  void CGameDialog::GameFileExport( const Callback<void(int)> & importCallback ) const {

diff --cc radiant/xywindow.cpp
Simple merge

diff --cc radiant/xywindow.h
Simple merge

diff --cc tools/quake3/q3map2/game_quake3.h
Simple merge

diff --cc tools/quake3/q3map2/map.c
Simple merge