]> 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: ead48de 1ed0504)
Merge remote-tracking branch 'origin/fruitiex/disable-shootanim'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:33:46 +0000 (14:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:33:46 +0000 (14:33 +0200)
1  2 
qcsrc/server/cl_weapons.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_weaponsystem.qc patch | diff1 | diff2 | blob | history

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