From: Mario Date: Thu, 27 Nov 2014 02:41:58 +0000 (+1100) Subject: Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons' X-Git-Tag: xonotic-v0.8.0~137 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=841eddf27ba5cb43d5b3fc01e67cb9d7526e6bdc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons' --- 841eddf27ba5cb43d5b3fc01e67cb9d7526e6bdc