]> 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: cd47334 3545ddc)
Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill...
authorterencehill <piuntn@gmail.com>
Sun, 17 Apr 2011 10:32:10 +0000 (12:32 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 17 Apr 2011 10:32:10 +0000 (12:32 +0200)
1  2 
hud_luminos.cfg patch | diff1 | diff2 | blob | history

diff --cc hud_luminos.cfg
Simple merge