]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/cl_weaponsystem.qc

Simple merge