From: Rudolf Polzer Date: Fri, 9 Jul 2010 21:08:38 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx' X-Git-Tag: xonotic-v0.1.0preview~374 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f217d0db491385cbf8e5e0ee2446d8222f0d5883 Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx' --- f217d0db491385cbf8e5e0ee2446d8222f0d5883