]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:02:21 +0000 (17:02 +0100)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:02:21 +0000 (17:02 +0100)
commitaaf5368f6d93c557b01b9b10f2395a269ed570ee
treea37ee7a24a0afbdcd39374d9a24789ea448e05a2
parentd1a8653071750acc7d64b3c66d8ac1a89cc8b35a
parent1f30228e4e244da9170c2c966607da457e2a1e22
Merge branch 'master' into kuniuthefrogg/boil