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

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

6e6a342be3420b80515b2d92899f78709f77aa0b