]> 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: 15a18e8 ab627cf)
Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:14:04 +0000 (00:14 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:14:04 +0000 (00:14 +1100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/common/mapinfo.qh patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/common/mapinfo.qh
Simple merge