Merge branch 'master' into terencehill/cfg_fixes

diff --cc xonotic-client.cfg
Simple merge

diff --cc xonotic-common.cfg
index 6626eb82644b5d4ab9137769667871aedf833c9e,97c88c21b8442644bcbd4d2422c52d91d4974c42..899b217cdd62e2ab51fbd34c0dd5a3df6fcaf69b
--- 1/xonotic-common.cfg
--- 2/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@@ -160,8 -151,11 +157,8 @@@ set debug_deglobalization_clear 0 "mak
  // disabling until it's complete
  set prvm_garbagecollection_enable 0
  
- set g_mapinfo_q3compat 1 "0: generate .mapinfo if none exists, ignoring .arena and .defi files. 1: read .arena and .defi files, don't generate .mapinfo. 2: generate .mapinfo if none exists using data from .arena files instead of reading them, .defi files continue to be used directly"
+ set g_mapinfo_q3compat 1 "If no .mapinfo file exists:: 0: generate .mapinfo using entities only. 1: read .arena and .defi files directly, don't generate .mapinfo. 2: generate .mapinfo using .arena and .defi files, and entities. 3: generate .mapinfo using .arena and .defi files only."
  
 -// load console command aliases and settings
 -exec commands.cfg
 -
  // ... and now that everything is configured/aliased, we can do some things:
  
  // Change g_start_delay based upon if the server is local or not.