Merge branch 'master' of https://github.com/rheit/zdoom
Merge branch 'master' of https://github.com/rheit/zdoom

Conflicts:
	src/sdl/iwadpicker_cocoa.mm
Merge branch 'master' of https://github.com/rheit/zdoom
A_Log formatted text

Make DECORATE version of Log consistent with ACS version.
Merge branch 'master' of https://github.com/Gaerzi/zdoom
Merge branch 'master' of https://github.com/rheit/zdoom

Conflicts:
	.gitignore
	src/CMakeLists.txt
Merge branch 'master' of https://github.com/coelckers/gzdoom into osx