From: Rudolf Polzer Date: Sat, 13 Jul 2013 09:16:56 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents' X-Git-Tag: xonotic-v0.8.0~38 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f116ce0dad0774b06f192bad8a3bf36d670c769;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents' --- 0f116ce0dad0774b06f192bad8a3bf36d670c769