]> 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: 00c0fca b517c2b)
Merge remote branch 'origin/samual/balance_testing'
authorSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:58:46 +0000 (17:58 -0500)
committerSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:58:46 +0000 (17:58 -0500)

Trivial merge