]> 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: 5971450 29efd04)
Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 2 Apr 2012 06:49:53 +0000 (08:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 2 Apr 2012 06:49:53 +0000 (08:49 +0200)

Trivial merge