]> 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: 38d6022 8ad8bf0)
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Sat, 14 May 2011 15:58:57 +0000 (11:58 -0400)
committerSamual <samual@xonotic.org>
Sat, 14 May 2011 15:58:57 +0000 (11:58 -0400)

Trivial merge