From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 4 Dec 2011 16:24:59 +0000 (-0300)
Subject: Merge branch 'master' into divVerent/waypointeditor-auto
X-Git-Tag: xonotic-v0.6.0~188^2~4^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c82506dd6bc9452173af819856a0cae51bda9ef9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/waypointeditor-auto
---

c82506dd6bc9452173af819856a0cae51bda9ef9