]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:22:48 +0000 (12:22 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:22:48 +0000 (12:22 +0300)
commitb8ad7477ca022feff76a1634c7ca8dcaaf54937c
treeeb501f490a3bccec3a0b2531688600ed0c7a723a
parent8b8f7266ec4abee9e84a5f4047b035e1f2b05db3
parent8c1b0e27f131c21a6004c2e43749a4b7ef317eb4
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/common/t_items.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/events.qh