]> 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: 0ed85c3 4d2ad36)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 28 Dec 2011 19:07:41 +0000 (14:07 -0500)
committerSamual <samual@xonotic.org>
Wed, 28 Dec 2011 19:07:41 +0000 (14:07 -0500)

Trivial merge