]> 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: 2547369 bb45719)
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
authorSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)
committerSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

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