]> 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: 762698f a1583ae)
Merge branch 'master' into divVerent/weapons-field-rewrite
authorRudolf Polzer <divverent@xonotic.org>
Mon, 5 Mar 2012 13:03:30 +0000 (14:03 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 5 Mar 2012 13:03:30 +0000 (14:03 +0100)

Trivial merge