]> 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: ad44443 cc2b801)
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure' into terencehi...
authorterencehill <piuntn@gmail.com>
Mon, 29 Apr 2013 17:39:11 +0000 (19:39 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 29 Apr 2013 17:39:11 +0000 (19:39 +0200)

Trivial merge