]> 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: e95ef7f ea2bf33)
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

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