]> 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: 9e17e23 93a11d3)
Merge remote-tracking branch 'origin/samual/crylink_rebalance'
authorSamual Lenks <samual@xonotic.org>
Thu, 20 Sep 2012 13:26:26 +0000 (09:26 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 20 Sep 2012 13:26:26 +0000 (09:26 -0400)

Trivial merge