]> 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: 525671e 0d92c73)
Merge branch 'master' into terencehill/infomessages_panel_update
authorterencehill <piuntn@gmail.com>
Thu, 23 Jun 2016 16:58:13 +0000 (18:58 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 23 Jun 2016 16:58:13 +0000 (18:58 +0200)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge