From: Rudolf Polzer Date: Wed, 8 Jun 2011 19:30:03 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into divVerent/libavcodec X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=659c5d94a7bb791d62d5aad42ad3553623bf34ee;p=xonotic%2Fdarkplaces.git Merge remote-tracking branch 'origin/master' into divVerent/libavcodec --- 659c5d94a7bb791d62d5aad42ad3553623bf34ee