From: Pearce Michal Date: Thu, 31 Mar 2011 03:57:46 +0000 (-0400) Subject: Merge branch 'theshadow/reflection' of git://git.xonotic.org/xonotic/xonotic-maps... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e084545ac562550c0253443c7de84bf8e4183b7;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'theshadow/reflection' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into theshadow/reflection --- 4e084545ac562550c0253443c7de84bf8e4183b7