]> 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: a3bc20a b458653)
Merge remote branch 'origin/master' into sev/hudlayout
authorSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:54:12 +0000 (03:54 -0400)
committerSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:54:12 +0000 (03:54 -0400)

Trivial merge