]> 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: c0d2728 8a4ebca)
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Tue, 28 Feb 2017 18:47:27 +0000 (19:47 +0100)
committerMirio <opivy@hotmail.de>
Tue, 28 Feb 2017 18:47:27 +0000 (19:47 +0100)

Trivial merge