]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:15:06 +0000 (02:15 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:15:06 +0000 (02:15 +0300)
commit0c9dd3dc86980691a6f9a58d5017879d915257e0
tree780d50e4a83319fc6ef2f041634a7642b42ef3a1
parent6cf0f285e8ab03dfacf9ca27c5ff972db1247c86
parent264c9f48d418d1ebd4b5ef5868b85f92644917dc
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/master
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/t_items.qc