]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8989486 e3898bd)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 20 Dec 2011 15:20:43 +0000 (10:20 -0500)
committerSamual <samual@xonotic.org>
Tue, 20 Dec 2011 15:20:43 +0000 (10:20 -0500)

Trivial merge