]> 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: c84e504 2c5bebc)
Merge remote-tracking branch 'origin/tzork/gm_nexball'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 10:02:19 +0000 (11:02 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 10:02:19 +0000 (11:02 +0100)

Trivial merge