]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/euclidean_fail divVerent/euclidean_fail
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 5 Apr 2018 20:25:56 +0000 (13:25 -0700)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 5 Apr 2018 20:25:56 +0000 (13:25 -0700)
commita9e7ede3aaebc406da6b3f0d5b92f7c13f464cb0
tree432aea3a4722eeae19349f3817239a8b6e781a76
parent266f02aa1a36482af0a8234cdcfdec92da6b51ec
parentd5701c7ca1a78000df45b7da9a935566f00ca310
Merge branch 'master' into divVerent/euclidean_fail