]> 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: 76d2c0f 1e54e22)
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:35:05 +0000 (14:35 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:35:05 +0000 (14:35 +0200)

Trivial merge