]> 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: 3fdcce6 362913b)
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 21 Sep 2011 14:56:56 +0000 (10:56 -0400)
committerSamual <samual@xonotic.org>
Wed, 21 Sep 2011 14:56:56 +0000 (10:56 -0400)
Conflicts:
balanceXonotic.cfg


Trivial merge