Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival

author Lyberta <lyberta@lyberta.net>

Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)

committer Lyberta <lyberta@lyberta.net>

Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)
author Lyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)
committer Lyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)
diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/mutators/events.qh
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Fri, 27 Apr 2018 09:23:57 +0000 (12:23 +0300)
		1	2
qcsrc/common/t_items.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/events.qh	patch \|	diff1 \|	diff2 \|	blob \| history