]> 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: 571c1f7 2947640)
Merge branch 'terencehill/aim_shake_fix'
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:24:59 +0000 (11:24 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:24:59 +0000 (11:24 +1100)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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