]> 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: 60025fc 1fe0c35)
Merge branch 'master' into samual/balancesamual
authorSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:00:11 +0000 (10:00 -0500)
committerSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:00:11 +0000 (10:00 -0500)

Trivial merge