From: Rudolf Polzer Date: Sun, 29 May 2011 12:45:19 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into divVerent/libavcodec X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4f3f7783d04cefce73a34d8f5394f531d59ea21;p=xonotic%2Fdarkplaces.git Merge remote-tracking branch 'origin/master' into divVerent/libavcodec --- a4f3f7783d04cefce73a34d8f5394f531d59ea21