From: Samual Date: Mon, 29 Aug 2011 05:52:13 +0000 (-0400) Subject: Merge remote branch 'origin/master' into samual/fix_camera_in_intermission X-Git-Tag: xonotic-v0.5.0~29^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2baadb34fab4fa42d1529f083eb72b4df105049;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into samual/fix_camera_in_intermission --- b2baadb34fab4fa42d1529f083eb72b4df105049