]> 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: bd5ece6 0904276)
Merge remote branch 'origin/samual/config_updates'
authorSamual <samual@xonotic.org>
Thu, 22 Dec 2011 22:36:41 +0000 (17:36 -0500)
committerSamual <samual@xonotic.org>
Thu, 22 Dec 2011 22:36:41 +0000 (17:36 -0500)

Trivial merge