Merge remote-tracking branch 'origin/Mario/extralife_fix'
authorSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 21:47:38 +0000 (17:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 21:47:38 +0000 (17:47 -0400)
commitf600c870d8c86806c33c99a8ae35f796bfc5de66
treeba972aef317989b2cf2d51d821adc11f7a98a65c
parent923a5a2213f06b4337038e744e89d1955f9b195c
parent6da43def85c45064172b55faaa8cd811f22ae179
Merge remote-tracking branch 'origin/Mario/extralife_fix'
qcsrc/server/t_items.qc