]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commitb38ec36e49c1a3554ee2ffb3c4f9b1976d132c08
tree15032ce3bd98c1f34d6350c9760fbd3cee360641
parentea96f9e0202ad06f38944d62256ca15a8fcb4729
parentcdf0b8960e515941ca97e4c5aca39c42d968e04d
Merge branch 't0uYK8Ne/oilrig' into 'master'

t0uYK8Ne/oilrig

Closes #129

See merge request !82