]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 560037a fd518e8)
Merge remote branch 'origin/master' into samual/change_default_balance
authorSamual <samual@xonotic.org>
Thu, 24 Mar 2011 16:24:41 +0000 (12:24 -0400)
committerSamual <samual@xonotic.org>
Thu, 24 Mar 2011 16:24:41 +0000 (12:24 -0400)

Trivial merge