Merge branch 'master' into terencehill/music_player

diff --cc defaultXonotic.cfg
index 7cac58a672a56d4f05f662c4423d7ca84571a8b5,c392e9a1580728f922da3abfadfce58a2e25d1f3..4f42f4a96e8b0ee2bd896e0d9c9fac1d78f260d9
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1420,15 -1111,10 +1111,10 @@@ cd remap $g_cdtracks_remaplis
  set sv_intermission_cdtrack ""
  
  set g_cdtracks_dontusebydefault "rising-of-the-phoenix"
 -set menu_cdtrack "rising-of-the-phoenix"
 +seta menu_cdtrack "rising-of-the-phoenix"
  
- // maxidle (in seconds): kick players idle for more than that amount of time
- set sv_maxidle 0
- // when sv_maxidle is not 0, assume spectators are idle too
- set sv_maxidle_spectatorsareidle 0
- 
- // CTF capture limit placeholder cvar
- set capturelimit 0
+ set sv_maxidle 0 "kick players idle for more than this amount of time in seconds"
+ set sv_maxidle_spectatorsareidle 0 "when sv_maxidle is not 0, assume spectators are idle too"
  
  // these entities are not referenced by anything directly, they just represent
  // teams and are found by find() when needed

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