]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/AssaultIcons 576/head
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:19:34 +0000 (15:19 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:19:34 +0000 (15:19 +0300)
commit25bfe79fe909550426d761d99ac65e38c59433ad
tree199a4c389a33fe79e2c08a6a43fd63b6f3cc52a5
parent2691ea04a6a02f814de914851bbbda1961efe8d3
parentaa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733
Merge branch 'master' into Lyberta/AssaultIcons