From: Mirio Date: Sun, 12 Mar 2017 15:14:01 +0000 (+0000) Subject: Merge branch 'matthiaskrgr/runningmanctf_basefix' into 'master' X-Git-Tag: xonotic-v0.8.2~72 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9946cbd089e1fcb8058e8ef5cd32939bf45c44d5;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'matthiaskrgr/runningmanctf_basefix' into 'master' runningmanctf: remove duplicate blue base See merge request !73 --- 9946cbd089e1fcb8058e8ef5cd32939bf45c44d5