From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Jul 2018 12:29:07 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=215f663f99a2f8aa522a9d04b76633de737a28f5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/Survival' into Lyberta/master
---

215f663f99a2f8aa522a9d04b76633de737a28f5
diff --cc qcsrc/menu/xonotic/keybinder.qc
index 9544cff94,a14406bce..5d17a04d6
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@@ -33,9 -33,8 +33,9 @@@ void Xonotic_KeyBinds_Read(
  	KEYBIND_DEF("+moveright"                            , _("strafe right"));
  	KEYBIND_DEF("+jump"                                 , _("jump / swim"));
  	KEYBIND_DEF("+crouch"                               , _("crouch / sink"));
 +	KEYBIND_DEF("+sprint"                               , _("sprint"));
  	KEYBIND_DEF("+hook"                                 , _("off-hand hook"));
- 	KEYBIND_DEF("+jetpack"                              , _("jet pack"));
+ 	KEYBIND_DEF("+jetpack"                              , _("jetpack"));
  	KEYBIND_DEF(""                                      , "");
  	KEYBIND_DEF(""                                      , _("Attacking"));
  	KEYBIND_DEF("+fire"                                 , _("primary fire"));