fix merge

[xonotic/netradiant.git] / radiant / mainframe.cpp

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 4dd87b719fdf4efdf184da7c8f383b94ba75293b..cf0525aa56145feab1fb4aa83c8a7bcfdb2eea00 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -3582,9 +3582,6 @@ void MainFrame_Construct(){
        GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg), Accelerator( 'R', (GdkModifierType)GDK_SHIFT_MASK ) );
        GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
-       GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg) );
-       GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg) );
-
        GlobalCommands_insert( "BuildMenuCustomize", makeCallbackF(DoBuildMenu) );
        GlobalCommands_insert( "Build_runRecentExecutedBuild", makeCallbackF(Build_runRecentExecutedBuild), Accelerator( GDK_F5 ) );