]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b950eab 386b2f1)
Merge remote branch 'origin/tzork/nexballarena'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:20:41 +0000 (15:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:20:41 +0000 (15:20 +0100)

Trivial merge