]> 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: babcfa3 e8f3747)
Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:29:28 +0000 (23:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:29:28 +0000 (23:29 +0200)
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