From: Rudolf Polzer Date: Sun, 13 Jun 2010 19:27:27 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes' X-Git-Tag: xonotic-v0.1.0preview~428 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f943e217277aeabf50653915f977ef168797021c;hp=--cc Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes' --- f943e217277aeabf50653915f977ef168797021c