]> 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: 785f6da 69a2e2b)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Fri, 2 Dec 2011 13:13:36 +0000 (14:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 2 Dec 2011 13:13:36 +0000 (14:13 +0100)

Trivial merge