]> 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: f15ff9f ffd3614)
Merge remote-tracking branch 'origin/samual/flyingspectators'
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:59:42 +0000 (00:59 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:59:42 +0000 (00:59 -0300)

Trivial merge