]> 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: c500f77 d254fe0)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 24 Sep 2011 18:56:30 +0000 (14:56 -0400)
committerSamual <samual@xonotic.org>
Sat, 24 Sep 2011 18:56:30 +0000 (14:56 -0400)

Trivial merge