]> 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: 6b89adf 1aeef37)
Merge remote branch 'origin/fruitiex/arenafix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)

Trivial merge