]> 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: afa2910 9d9a90d)
Merge remote branch 'origin/sev/menuadjustments'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:06:53 +0000 (07:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:06:53 +0000 (07:06 +0100)

Trivial merge