]> de.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: d354be0 c91bb6a)
Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Tue, 7 Apr 2015 20:16:20 +0000 (06:16 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 7 Apr 2015 20:16:20 +0000 (06:16 +1000)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/gamemode_ctf.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/mutators/gamemode_ctf.qc
Simple merge