]> 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: 545cc76 b0ae28d)
Merge branch 'terencehill/keybinds.txt.it_update' into 'master'
authorRudolf Polzer <divverent@gmail.com>
Sun, 11 Jan 2015 16:09:16 +0000 (16:09 +0000)
committerRudolf Polzer <divverent@gmail.com>
Sun, 11 Jan 2015 16:09:16 +0000 (16:09 +0000)
Terencehill/keybinds.txt.it update

keybinds.txt.it update

See merge request !71


Trivial merge