]> 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: cc7d9b8 04971a8)
Merge remote branch 'refs/remotes/origin/terencehill/menu-more_keys'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 07:33:55 +0000 (09:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 07:33:55 +0000 (09:33 +0200)

Trivial merge