From: Samual <samual@xonotic.org>
Date: Sat, 14 May 2011 18:17:58 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a56126defd6f79767147edebccf6f46022e37ecf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into terencehill/screenshot_viewer

Conflicts:
	qcsrc/menu/xonotic/mainwindow.c
---

a56126defd6f79767147edebccf6f46022e37ecf
diff --cc qcsrc/menu/xonotic/mainwindow.c
index 314d192bb,feec5a9b9..9162c850d
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -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);