]> 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: 001250c 6a59118)
Merge remote-tracking branch 'origin/samual/individual_switchdelay'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)

Trivial merge