]> 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: 7dc8ba7 f2c50fe)
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)
1  2 
qcsrc/dpdefs/csprogsdefs.qh patch | diff1 | diff2 | blob | history
qcsrc/dpdefs/menudefs.qh patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/dpdefs/csprogsdefs.qh
Simple merge
diff --cc qcsrc/dpdefs/menudefs.qh
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge