From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Apr 2010 13:58:21 +0000 (+0200)
Subject: Merge commit 'origin/tzork/pathlib'
X-Git-Tag: xonotic-v0.1.0preview~645
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3746a1f762597b2ca317c4914c052bf229b9f91;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/tzork/pathlib'
---

e3746a1f762597b2ca317c4914c052bf229b9f91