From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Jun 2011 07:16:32 +0000 (+0200)
Subject: Merge remote branch 'origin/divVerent/newwaypointsprites'
X-Git-Tag: xonotic-v0.5.0~199^2~14^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4afb8036440fbfb9b22ec4c71dfe6fa8c25751dd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/newwaypointsprites'
---

4afb8036440fbfb9b22ec4c71dfe6fa8c25751dd