Merge branch 'master' into terencehill/arena_stuff
authorterencehill <piuntn@gmail.com>
Sat, 20 Aug 2011 16:08:09 +0000 (18:08 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 20 Aug 2011 16:08:09 +0000 (18:08 +0200)
commit9c40c25078426ed90e985c402c648fea3e3a8832
tree749bd4a37c5f1582f117733b5e1a4dcb2b245c01
parent01e79c17c82c10622708fb4e2ce2efc818d1a0ef
parente8f8cb2a64ce0944e0ee83d4771f9fbf395863a4
Merge branch 'master' into terencehill/arena_stuff

Conflicts:
qcsrc/server/arena.qc
qcsrc/server/arena.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/gamemode_freezetag.qc