]> 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: 8d6b0ad 5d2f745)
Merge branch 'master' into kuniuthefrogg/atomforge
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:55:24 +0000 (09:55 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:55:24 +0000 (09:55 +0100)

Trivial merge