]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc134f2 c5d7114)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Mon, 26 Sep 2011 00:37:12 +0000 (20:37 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 00:37:12 +0000 (20:37 -0400)

Trivial merge