]> 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: e5deb72 cc1a3ab)
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 2 Mar 2011 00:22:10 +0000 (19:22 -0500)
committerSamual <samual@xonotic.org>
Wed, 2 Mar 2011 00:22:10 +0000 (19:22 -0500)

Trivial merge