Merge branch 'master' into fruitiex/dryfirefix
authorFruitieX <fruitiex@gmail.com>
Sun, 14 Nov 2010 18:28:00 +0000 (20:28 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 14 Nov 2010 18:28:00 +0000 (20:28 +0200)
commit5764a546c4ad8680e37f49ea1f53943f2cf0d187
treed3720b1f36993e4067e254662ae8dbc6e61401a4
parentbdd8556719bfcae595068d90d0aafaef9308d38b
parent8822f6725a56ed6ac74a2d2a8bdbf342d5581c58
Merge branch 'master' into fruitiex/dryfirefix
qcsrc/server/cl_weaponsystem.qc