]> 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: 23510c4 efa0c01)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/unsea...
authorMaik Merten <maikmerten@googlemail.com>
Fri, 14 Oct 2011 19:38:27 +0000 (21:38 +0200)
committerMaik Merten <maikmerten@googlemail.com>
Fri, 14 Oct 2011 19:38:27 +0000 (21:38 +0200)

Trivial merge