]> 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: 8aa3321 6ace807)
Merge remote branch 'origin/samual/balance'
authorSamual <samual@xonotic.org>
Wed, 5 Oct 2011 04:32:32 +0000 (00:32 -0400)
committerSamual <samual@xonotic.org>
Wed, 5 Oct 2011 04:32:32 +0000 (00:32 -0400)

Trivial merge