CorsixTH/CorsixTH — pull request #244 by jorgenpt (2014-04-19 20:54:22+00:00)
Title: Merge master to sdl2

This pulls in changes up till right before the whitespace fix.
I merged that separately to make it cleaner, and I'll send the pull req next.