]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/TeamplayFixes2 507/head
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)
commita9c2426d7cc2e1f42f0e7469f95efffa29957293
treed4c88d66878294ea5e790d08a39566cf69d81f2a
parent72e74a9c6ef3d72e662eeecbb38801bd025f058c
parent65493c17d47c0d5ece5e28a999a0162c5b070acb
Merge branch 'master' into Lyberta/TeamplayFixes2