]> 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: 872bbe1 cf8895a)
Merge remote-tracking branch 'origin/master' into Mario/quickmenu_merge
authorSamual Lenks <samual@xonotic.org>
Fri, 27 Dec 2013 08:20:57 +0000 (03:20 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 27 Dec 2013 08:20:57 +0000 (03:20 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/common/util.qh patch | diff1 | diff2 | blob | history

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