]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c775b25 6c2918a)
Merge remote-tracking branch 'origin/terencehill/keys_fixes'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:06:03 +0000 (11:06 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:06:03 +0000 (11:06 +0200)
* origin/terencehill/keys_fixes:
  Forbid capslock and numlock from being bound in the menu


Trivial merge