]> de.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: 943e5ba 4dc56d4)
Merge remote-tracking branch 'origin/terencehill/spectate_prev'
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:15:35 +0000 (21:15 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:15:35 +0000 (21:15 -0400)

Trivial merge