]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71bf8a7 66a21db)
Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:42:06 +0000 (07:42 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:42:06 +0000 (07:42 +0200)
1  2 
qcsrc/server/cl_weaponsystem.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/cl_weaponsystem.qc
Simple merge