Merge branch 'master' into divVerent/desktopfullscreen

Conflicts:
	qcsrc/menu/menu.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/util-pre.qh
Simple merge

diff --cc qcsrc/menu/menu.qc
index 490a40a4d116bc497a0add07acaf6a4941490a4f,1afc9f85d935c3e5958a31ba9cdd206fbf56afc0..fd4fced57db0aa0d2a1a3c6fb2f970def7baf1b9
--- 1/qcsrc/menu/menu.qc
--- 2/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -91,10 -91,9 +91,10 @@@ void m_init(
        }
  }
  
- float MENU_ASPECT = 1.25; // 1280x1024
- float MENU_MINHEIGHT = 600;
+ const float MENU_ASPECT = 1.25; // 1280x1024
+ const float MENU_MINHEIGHT = 600;
 -float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight;
 +float conwidth_s, conheight_s, vidwidth_s, vidheight_s, realconwidth,
 +      realconheight, screenconwidth, screenconheight;
  void draw_reset_cropped()
  {
        draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight));

diff --cc qcsrc/menu/xonotic/slider_resolution.c
Simple merge