]> 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: a81b58e a1c5933)
Merge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data...
authorSamual <samual@xonotic.org>
Wed, 23 Mar 2011 01:36:13 +0000 (21:36 -0400)
committerSamual <samual@xonotic.org>
Wed, 23 Mar 2011 01:36:13 +0000 (21:36 -0400)

Trivial merge