Merge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge

diff --cc radiant/camwindow.cpp
Simple merge

diff --cc radiant/camwindow.h
Simple merge

diff --cc radiant/mainframe.cpp
index acc56f614abc5458a9c07910a9f6ad9eac7db7a4,c2efdc3aa34452176c32071912c63f5273c03534..ec650edfbb4615bbbf7061def16ecf480db9797a
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -2184,14 -2092,12 +2170,15 @@@ ui::MenuItem create_view_menu( MainFram
                create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane In", "CubicClipZoomIn" );
                create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane Out", "CubicClipZoomOut" );
                menu_separator( camera_menu );
 +              create_menu_item_with_mnemonic( camera_menu, "Decrease FOV", "FOVDec" );
 +              create_menu_item_with_mnemonic( camera_menu, "Increase FOV", "FOVInc" );
 +              menu_separator( camera_menu );
                create_menu_item_with_mnemonic( camera_menu, "Next leak spot", "NextLeakSpot" );
                create_menu_item_with_mnemonic( camera_menu, "Previous leak spot", "PrevLeakSpot" );
-               menu_separator( camera_menu );
-               create_menu_item_with_mnemonic( camera_menu, "Look Through Selected", "LookThroughSelected" );
-               create_menu_item_with_mnemonic( camera_menu, "Look Through Camera", "LookThroughCamera" );
+               //cameramodel is not implemented in instances, thus useless
+ //            menu_separator( camera_menu );
+ //            create_menu_item_with_mnemonic( camera_menu, "Look Through Selected", "LookThroughSelected" );
+ //            create_menu_item_with_mnemonic( camera_menu, "Look Through Camera", "LookThroughCamera" );
        }
        menu_separator( menu );
        {

diff --cc radiant/xywindow.cpp
index e5128ae7db609b38335d9229f684897437c64a64,e573d6568d55dcd13035df48c6c81bbcbaeda1a8..63ef5973b107e3eb25f175ef1775795d639086c6
--- 1/radiant/xywindow.cpp
--- 2/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@@ -827,9 -822,11 +827,10 @@@ gboolean xywnd_expose( ui::Widget widge
        return FALSE;
  }
  
 -
  void XYWnd_CameraMoved( XYWnd& xywnd ){
        if ( g_xywindow_globals_private.m_bCamXYUpdate ) {
-               XYWnd_Update( xywnd );
+               //XYWnd_Update( xywnd );
+               xywnd.UpdateCameraIcon();
        }
  }
  

diff --cc radiant/xywindow.h
Simple merge