From: terencehill Date: Sun, 15 Feb 2015 18:55:56 +0000 (+0100) Subject: Merge branch 'master' into terencehill/weapon_panel_retry X-Git-Tag: xonotic-v0.8.1~106^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2dcda55f8f91951636a066b44c0b96719162ae25;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/weapon_panel_retry --- 2dcda55f8f91951636a066b44c0b96719162ae25