]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/mrbougo/sgmelee-body'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:12:06 +0000 (22:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:12:06 +0000 (22:12 +0200)
1  2 
qcsrc/server/w_shotgun.qc

Simple merge