]> 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: d204c4e 8d640f8)
Merge remote-tracking branch 'origin/master' into tzork/turrets-csqc
authorJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:32:49 +0000 (07:32 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:32:49 +0000 (07:32 +0200)

Trivial merge