]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/KillSound
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:04:02 +0000 (19:04 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:04:02 +0000 (19:04 +0300)
commit02656a36f5e7fe11380396bfa78c0d0049e19891
treef4fbda4151f415936512f85e39a4fc87ca445e76
parentb34b4a1dbfe6c43ce6ffbec3ad7af782bcb561db
parent592256dcbdd52ee36778295ce0be2c5a568f6fc6
Merge branch 'master' into Lyberta/KillSound