]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/common/t_items.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/events.qh

Simple merge
Simple merge
Simple merge
Simple merge