]> 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: feb54c2 729f941)
Merge remote-tracking branch 'origin/master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 14:37:36 +0000 (15:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 14:37:36 +0000 (15:37 +0100)

Trivial merge