Merge branch 'master' into terencehill/arena_and_ca_fixes
authorterencehill <piuntn@gmail.com>
Thu, 12 Jan 2012 19:14:07 +0000 (20:14 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 12 Jan 2012 19:14:07 +0000 (20:14 +0100)
commitdf4fbc07dacc9c2785e2cbe3f9010c4e07ed10ad
tree24ed83374eb2074f2df53c0b3311313e247b265e
parentaf65d6be57cc21d4609edd764fe413d8742a3fdc
parent7dc4c6ee1f6581a922aa18e5cd3edc33d76ec2dc
Merge branch 'master' into terencehill/arena_and_ca_fixes
qcsrc/server/defs.qh