From: nyov Date: Sat, 7 Jan 2012 19:43:48 +0000 (+0100) Subject: Merge branch 'master' into nyov/dedicated-startupscreen X-Git-Tag: xonotic-v0.7.0~356^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c7809f1cf117eb207add4956bac3b3d9233101b3 Merge branch 'master' into nyov/dedicated-startupscreen --- c7809f1cf117eb207add4956bac3b3d9233101b3