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

Conflicts:
	qcsrc/menu/xonotic/mainwindow.c

diff --cc qcsrc/menu/classes.c
Simple merge

diff --cc qcsrc/menu/xonotic/mainwindow.c
index 314d192bb9b39f8b69d96ffce17132099c3d3e52,feec5a9b92595baa6cbbdc808ae926a3ea3a2793..9162c850dad5a10c2533b3327078e956e085fd9e
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/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);