]> 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: 0a19088 bd4eebf)
Merge branch 'master' into monad/zenith
authormonad <monadxon@aol.com>
Fri, 30 Aug 2013 12:50:05 +0000 (14:50 +0200)
committermonad <monadxon@aol.com>
Fri, 30 Aug 2013 12:50:05 +0000 (14:50 +0200)

Trivial merge