]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Tue, 3 May 2011 17:17:34 +0000 (13:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 3 May 2011 17:17:34 +0000 (13:17 -0400)
commit705917e81091eda1810ea67c2d6034caf021f2dc
treece821de2d57e41042107597a2944f3869f64cd79
parentb8f39159e32e43bb8fafb5d49a599cddc94a9011
parent69fb3ad9e95135d9e501d0354b2d934d91fb70d8
Merge remote branch 'origin/master' into samual/flyingspectators
qcsrc/warpzonelib/server.qc