]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a39370e 5d17502)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:48:12 +0000 (11:48 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:48:12 +0000 (11:48 -0500)

Trivial merge