]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:14:38 +0000 (02:14 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:14:38 +0000 (02:14 +0300)
commit3e69af8204d6ef02c050a9edb127a6be44f1173d
tree9151fa90dc6d8bab063828a5fdafd9b0e4334a5a
parent7f5cc258e12ece06b7a518d652ddcb4a00d7040e
parent264c9f48d418d1ebd4b5ef5868b85f92644917dc
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/server/g_world.qc