Merge remote branch 'origin/master' into terencehill/screenshot_viewer
authorSamual <samual@xonotic.org>
Sat, 14 May 2011 18:17:58 +0000 (14:17 -0400)
committerSamual <samual@xonotic.org>
Sat, 14 May 2011 18:17:58 +0000 (14:17 -0400)
Conflicts:
qcsrc/menu/xonotic/mainwindow.c

1  2 
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c

Simple merge
@@@ -114,10 -113,10 +114,14 @@@ void MainWindow_configureMainWindow(ent
        i = spawnXonoticHUDInfoMessagesDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
--
++      
+       i = spawnXonoticHUDPhysicsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
++      
 +      me.screenshotViewerDialog = i = spawnXonoticScreenshotViewerDialog();
 +      i.configureDialog(i);
 +      me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
  
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);