Merge remote branch 'origin/terencehill/WEP_constants_fix' into fruitiex/ctsfix
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 21:56:37 +0000 (22:56 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 21:56:37 +0000 (22:56 +0100)
commitee1bc52fd8269edac22ce73ddecc88583fa1d623
treed7466b1d5576444ab3f2958474205499d4d071e5
parent6a3c13e48880ad03d3648263b662a48305648523
parent7b4c329bdd22d51521204c990e9111640996a2bf
Merge remote branch 'origin/terencehill/WEP_constants_fix' into fruitiex/ctsfix
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/t_items.qc