]> 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: 6a5f610 f12a9db)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 21 Jul 2011 17:56:59 +0000 (13:56 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Jul 2011 17:56:59 +0000 (13:56 -0400)

Trivial merge