]> 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: 3a7a8b1 f8da082)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sun, 16 Oct 2011 16:17:34 +0000 (12:17 -0400)
committerSamual <samual@xonotic.org>
Sun, 16 Oct 2011 16:17:34 +0000 (12:17 -0400)

Trivial merge