fixes bug on windows caused by bad merge
Merge branch 'refs/heads/musiceditor-cpow' into xplatform

Trival Conflicts:
	libs/famitracker/famitracker-lib.pro
fixes osx issues
Fixing xplatform merge conflicts.
Fixing xplatform merge conflicts.