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)
1  2 
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/t_items.qc

Simple merge