]> 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: bedc403 0736358)
Merge branch 'master' into terencehill/hud_configure
authorterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/hud_config.qc
Simple merge