]> 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: e648713 4db67ed)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 24 Dec 2011 22:18:09 +0000 (17:18 -0500)
committerSamual <samual@xonotic.org>
Sat, 24 Dec 2011 22:18:09 +0000 (17:18 -0500)

Trivial merge