]> 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: bfa8b1c 9793a2f)
Merge branch 'master' into kuniuthefrogg/atomforge
authorMirio <opivy@hotmail.de>
Sat, 11 Jul 2015 15:32:59 +0000 (17:32 +0200)
committerMirio <opivy@hotmail.de>
Sat, 11 Jul 2015 15:32:59 +0000 (17:32 +0200)

Trivial merge