]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4848aa1 1a53f98)
Merge remote branch 'origin/cbrutail/trakmodelfixes'
authorJakob MG <jakob_mg@hotmail.com>
Mon, 6 Jun 2011 14:23:49 +0000 (16:23 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Mon, 6 Jun 2011 14:23:49 +0000 (16:23 +0200)

Trivial merge