]> 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: fdc67cb f6f0432)
Merge branch 'master' into terencehill/newpanelhud-dom_points
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

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