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