From: Mario <zacjardine@y7mail.com>
Date: Sat, 11 Jul 2015 13:37:17 +0000 (+1000)
Subject: Merge branch 'debugger/shadow/atelier'
X-Git-Tag: xonotic-v0.8.1~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6fd14d25aea9338ef4811a45c91ebb0e06ef239a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'debugger/shadow/atelier'
---

6fd14d25aea9338ef4811a45c91ebb0e06ef239a