]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5cec7e bba4978)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 16:37:28 +0000 (18:37 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 16:37:28 +0000 (18:37 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_weaponsystem.qc patch | diff1 | diff2 | blob | history

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