]> 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: 10279a8 c34b479)
Merge remote branch 'origin/samual/updatecommands'
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 17:12:06 +0000 (12:12 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 17:12:06 +0000 (12:12 -0500)

Trivial merge