From: Samual Lenks Date: Tue, 28 Aug 2012 21:00:41 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/samual/create_scrshot_ent' X-Git-Tag: xonotic-v0.7.0~258 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4c9ec9c604db2d8fea28b80156d691e8e81fdb9;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/create_scrshot_ent' --- d4c9ec9c604db2d8fea28b80156d691e8e81fdb9