Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index e09eb1f11a0dce3cb89ebf1e1d603f93a24affc8,e9e2f026cf4d090b13ed89c618ac5bd1e6529158..139654ea83a93ac6d975738df90a19dde26dbe09
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1365,8 -1377,6 +1377,7 @@@ seta slowmo 
  seta menu_skin "luminos"
  set menu_slowmo 1
  seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
- set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 +seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
  
  r_textbrightness 0.2
  r_textcontrast 0.8

diff --cc qcsrc/menu/menu.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qh
Simple merge

diff --cc tooltips.db
Simple merge