From: Rudolf Polzer Date: Sun, 13 Feb 2011 17:24:42 +0000 (+0100) Subject: Merge branch 'master' into divVerent/libavcodec X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85c656bb0b42665eec41831a9dc83b58dbd29487;p=xonotic%2Fdarkplaces.git Merge branch 'master' into divVerent/libavcodec --- 85c656bb0b42665eec41831a9dc83b58dbd29487