]> 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: e4e1f6e 10a6371)
Merge remote branch 'origin/samual/balance'
authorSamual <samual@xonotic.org>
Fri, 4 Nov 2011 19:06:05 +0000 (15:06 -0400)
committerSamual <samual@xonotic.org>
Fri, 4 Nov 2011 19:06:05 +0000 (15:06 -0400)

Trivial merge