Merge branch 'master' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Sun, 27 Aug 2017 22:54:21 +0000 (01:54 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 27 Aug 2017 22:54:21 +0000 (01:54 +0300)
1  2 
balance-mario.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh
qcsrc/server/client.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
diff --cc balance-xdf.cfg
Simple merge
Simple merge
diff --cc balance-xpm.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge