]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 469f865 05ba717)
Merge branch 'packer/atelier-nofloodlight' into 'master'
authorMirio <opivy@hotmail.de>
Wed, 15 Mar 2017 19:03:47 +0000 (19:03 +0000)
committerMirio <opivy@hotmail.de>
Wed, 15 Mar 2017 19:03:47 +0000 (19:03 +0000)
packer/atelier-nofloodlight

See merge request !83


Trivial merge