Merge remote branch 'origin/terencehill/powerups_respawntime_fix'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:34:10 +0000 (20:34 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:34:10 +0000 (20:34 -0500)
commitdbdc35464a18f62bf550a20eddac9ec16b0eacee
treeffa2a3467fc235cf3e3a898f1c99fd1a2bb1de6b
parent7d4dafbc492a284a6f6ccfc36bb3a28df42e653c
parent89cc5b3274a190460a77cc03083e3fb7c532b19a
Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

Conflicts:
qcsrc/server/t_items.qc
qcsrc/server/arena.qc
qcsrc/server/t_items.qc