]> 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: 3bc58a4 26f37b6)
Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 04:20:41 +0000 (15:20 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 04:20:41 +0000 (15:20 +1100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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