]> 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: 3a967a6 a1a7f9e)
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Fri, 30 Sep 2011 14:38:16 +0000 (10:38 -0400)
committerSamual <samual@xonotic.org>
Fri, 30 Sep 2011 14:38:16 +0000 (10:38 -0400)

Trivial merge