]> 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: 3008455 4eb8ac8)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 12 Jul 2011 19:44:58 +0000 (15:44 -0400)
committerSamual <samual@xonotic.org>
Tue, 12 Jul 2011 19:44:58 +0000 (15:44 -0400)

Trivial merge