From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 12 Jul 2011 15:24:41 +0000 (+0200)
Subject: Merge remote branch 'origin/samual/waypointsprite_edgeoffset'
X-Git-Tag: xonotic-v0.5.0~52^2~3^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=4eb8ac8989271d4b19f6ed823133c69933c7e21a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/waypointsprite_edgeoffset'
---

4eb8ac8989271d4b19f6ed823133c69933c7e21a