]> 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: 9d15a94 5237780)
Merge remote branch 'origin/master' into samual/balancesamual
authorSamual <samual@xonotic.org>
Tue, 8 Feb 2011 06:22:02 +0000 (01:22 -0500)
committerSamual <samual@xonotic.org>
Tue, 8 Feb 2011 06:22:02 +0000 (01:22 -0500)

Trivial merge