]> 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: d87a536 bba4978)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 1 Oct 2011 15:30:17 +0000 (11:30 -0400)
committerSamual <samual@xonotic.org>
Sat, 1 Oct 2011 15:30:17 +0000 (11:30 -0400)

Trivial merge