]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c46645 e69c423)
Merge remote branch 'origin/cbrutail/trakmodelfixes'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 16 Jun 2011 15:19:15 +0000 (17:19 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 16 Jun 2011 15:19:15 +0000 (17:19 +0200)

Trivial merge