From: Jakob MG Date: Thu, 23 Aug 2012 19:54:42 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/no_damagedbycontents_when_gibbed' X-Git-Tag: xonotic-v0.7.0~268 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b772862f8e35704bd91da01be941ec25eb10e22;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/no_damagedbycontents_when_gibbed' --- 7b772862f8e35704bd91da01be941ec25eb10e22