]> 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: 7ebb787 9dccb1f)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Mon, 14 Nov 2011 05:43:33 +0000 (06:43 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 14 Nov 2011 05:43:33 +0000 (06:43 +0100)

Trivial merge