]> 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: 4b7673c 2ba3f70)
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
authorSamual Lenks <samual@xonotic.org>
Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)

Trivial merge