]> 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: 59adc8e 2c5b8e6)
Merge remote branch 'origin/master' into tzork/turrets-csqc
authorJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 22:03:53 +0000 (00:03 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 22:03:53 +0000 (00:03 +0200)

Trivial merge