]> 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: 0750442 1ed620d)
Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +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