]> 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: 5b935f3 8b6b565)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMaik Merten <maikmerten@googlemail.com>
Sun, 12 Feb 2012 12:16:20 +0000 (13:16 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sun, 12 Feb 2012 12:16:20 +0000 (13:16 +0100)

Trivial merge