]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commita321c69d9d812d97741c33099eaf295b1fa518ab
tree32079f951a1b7d488a37cf731cc95e6bbb5d9921
parentc84e504f3bc160b770bc8e7c5d334e3ebca51314
parent2c5bebce47736537b1a2311fb52db41a481f27f1
Merge remote-tracking branch 'origin/tzork/gm_nexball'