]> 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: 3cc3986 d52e81c)
Merge branch 'master' into kuniuthefrogg/atomforge
authorMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:05:38 +0000 (09:05 +0200)
committerMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:05:38 +0000 (09:05 +0200)

Trivial merge