]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/URS3
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)
commit585860c962df7da3cdc76f0b4e87ba4e028e42d5
treed6e953c28c8f3d45da583a3d5b7191f25fa0f1b4
parent1fa3d0f87c2e76a2476005911e4ece895c232642
parent529205ae72f71a51ad6f1c31a3b2c701007ebb4f
Merge branch 'master' into Lyberta/URS3