]> 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: 54ef76d 73d5ae2)
Merge branch 'master' into divVerent/weapons-field-rewrite
authorRudolf Polzer <divverent@xonotic.org>
Tue, 6 Mar 2012 09:37:07 +0000 (10:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 6 Mar 2012 09:37:07 +0000 (10:37 +0100)

Trivial merge