]> 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: 95dd310 13d6afd)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Sat, 19 Nov 2011 12:32:47 +0000 (13:32 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 19 Nov 2011 12:32:47 +0000 (13:32 +0100)

Trivial merge