From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 1 Sep 2011 08:20:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/merlijn/osxlion-windowed'
X-Git-Tag: xonotic-v0.5.0~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=006649f853f4838be4cb1ccdb8a435d5eae4be26;p=xonotic%2Fxonotic.git

Merge remote-tracking branch 'origin/merlijn/osxlion-windowed'
---

006649f853f4838be4cb1ccdb8a435d5eae4be26