]> 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: ea96f9e cdf0b89)
Merge branch 't0uYK8Ne/oilrig' into 'master'
authorMirio <opivy@hotmail.de>
Wed, 15 Mar 2017 10:06:32 +0000 (10:06 +0000)
committerMirio <opivy@hotmail.de>
Wed, 15 Mar 2017 10:06:32 +0000 (10:06 +0000)
t0uYK8Ne/oilrig

Closes #129

See merge request !82


Trivial merge