]> 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: 886e5f4 f4245c8)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 20 Nov 2011 04:45:40 +0000 (23:45 -0500)
committerSamual <samual@xonotic.org>
Sun, 20 Nov 2011 04:45:40 +0000 (23:45 -0500)

Trivial merge