]> 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: 6f43499 a084941)
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 27 Sep 2011 00:39:46 +0000 (20:39 -0400)
committerSamual <samual@xonotic.org>
Tue, 27 Sep 2011 00:39:46 +0000 (20:39 -0400)

Trivial merge