Merge branch 'des/racetimer_speed' into des/racesplits_panel

diff --cc xonotic-client.cfg
index f651b875130bf547e3a8c2c82008e4609ee65c56,58c29f8b93c3b1c27a5ac0455d43e3e12512c03d..889d5e3cec7087613ba14f896db170fddbcb4a55
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -714,9 -714,10 +714,9 @@@ seta cl_jetpack_jump 1 "Activate jetpac
  
  seta cl_race_cptimes_showself 1 "Always show your own times as well as the current best on checkpoints in Race/CTS"
  seta cl_race_cptimes_onlyself 0 "Only show your own times on checkpoints in Race/CTS. Can be forced on by the server via g_race_cptimes_onlyself"
- seta cl_race_cptimes_showspeed 0 "Show race checkpoint speed"
- seta cl_race_cptimes_showspeed_unit 1 "Show race checkpoint speed units (NOTE: ignores vertical speed)"
+ seta cl_race_cptimes_showspeed 0 "Show race checkpoint speed (NOTE: ignores vertical speed)"
+ seta cl_race_cptimes_showspeed_unit 1 "Show race checkpoint speed units"
  seta cl_race_checkpoint_splits_console 1 "Print checkpoint splits to console"
 -seta cl_race_checkpoint_splits_hud 1 "Show race checkpoint splits on HUD in infomessages"
  
  seta cl_cts_noautoswitch 0 "Prevent forced switching to new weapons in CTS"