]> 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: b42ee73 b9cc27a)
Merge branch 'master' into kuniuthefrogg/atomforge
authorMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:58:51 +0000 (13:58 +0200)
committerMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:58:51 +0000 (13:58 +0200)

Trivial merge