]> 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: f9d3785 78d6950)
Merge remote-tracking branch 'origin/terencehill/hud_crash_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:57:23 +0000 (18:57 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:57:23 +0000 (18:57 -0400)

Trivial merge