From: Rudolf Polzer Date: Sun, 19 Feb 2012 15:31:25 +0000 (+0100) Subject: Merge branch 'mediasource/m0rfar/SkySources' of git://git.xonotic.org/xonotic/oldstuff X-Git-Tag: xonotic-v0.6.0~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9cef73bd8e2f73fc41d71e49a3461fafb68ce15;p=xonotic%2Fmediasource.git Merge branch 'mediasource/m0rfar/SkySources' of git://git.xonotic.org/xonotic/oldstuff --- d9cef73bd8e2f73fc41d71e49a3461fafb68ce15