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

Trivial merge