]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into fruitiex/animations
authorSamual <samual@xonotic.org>
Fri, 19 Aug 2011 02:31:34 +0000 (22:31 -0400)
committerSamual <samual@xonotic.org>
Fri, 19 Aug 2011 02:31:34 +0000 (22:31 -0400)
commit6549351d5a5f2307e603f69f8f23528d6a8baeb3
treef16f8b6050666f305c9a2db16cce74119b713512
parentde910ee4aaa73329023a08b1a6c3190153c0b906
parent4a66a9e563f365169902c85f33b3eada7eb73744
Merge remote branch 'origin/master' into fruitiex/animations
qcsrc/server/w_shotgun.qc