From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Sep 2010 19:29:48 +0000 (+0200)
Subject: Merge remote branch 'origin/merlijn/osx-compile'
X-Git-Tag: xonotic-v0.5.0~224
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d1e944aca47338a45f451c593b63218598dc140;p=xonotic%2Fnetradiant.git

Merge remote branch 'origin/merlijn/osx-compile'
---

4d1e944aca47338a45f451c593b63218598dc140