]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/flyingspectators'
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:10:17 +0000 (00:10 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:10:17 +0000 (00:10 -0300)
1  2 
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge