]> 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: 83661c2 5eefde1)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 14 Aug 2011 18:28:09 +0000 (14:28 -0400)
committerSamual <samual@xonotic.org>
Sun, 14 Aug 2011 18:28:09 +0000 (14:28 -0400)

Trivial merge