]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 21:51:41 +0000 (00:51 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 21:51:41 +0000 (00:51 +0300)
commit14e7cef4146eb374b5767fbef0f5a5f856442680
tree8d5b524b2ac6494a6a56f898ae26e5a718640d49
parent75a74ff3dbce3d1f2476b480e06d3597f72c216b
parent8355e166329453efd962910ebad1b225b48ef70a
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/server/g_world.qc