]> 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: 260b928 02013c5)
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 06:56:12 +0000 (17:56 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 06:56:12 +0000 (17:56 +1100)
1  2 
qcsrc/common/playerstats.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/playerstats.qc
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge