From: Rudolf Polzer Date: Fri, 3 Jun 2011 20:15:57 +0000 (+0200) Subject: Merge branch 'master' into divVerent/libavcodec X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4dd3180e269048c3b99801967f41097c1ad9b400;p=xonotic%2Fdarkplaces.git Merge branch 'master' into divVerent/libavcodec --- 4dd3180e269048c3b99801967f41097c1ad9b400