]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMaddin <mjschwan@gmx.de>
Thu, 28 Jul 2016 18:31:14 +0000 (20:31 +0200)
committerMaddin <mjschwan@gmx.de>
Thu, 28 Jul 2016 18:31:14 +0000 (20:31 +0200)
commit008b094ad1d1a9c93047bc7925b52429979babf4
tree959d1ce778acd6d61d4e7acea1e70a3042bd1fcd
parentcae073f10ad500d60c247aa7ba6ef1cecb04ed30
parent1b5a2ad86496065d23a437e955dd81c2cc793a83
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into maddin/map-airwalk
... is it correct to merge upstream? :/ Let's try it!