Conflicts fixed
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
correct some merge error that happened from automatic git merging
remove some wxString references I missed
Merge pull request #155 from Bigpet/wxString_exorcism

Wx string exorcism fixups
blantant test code removal  well this is embarassing, VS didn't recompile it, so I didn't notice the mistake
remove dummy alias in strfmt. Fix some wxString remnants, that only make problems in Linux
fix indentation
Merge pull request #156 from Bigpet/wxString_exorcism

Fix static placeholder test.
Audio sync fix

Libmixer: SSPlayer draft
Detection fixed
Macros for function substitute registration
Update rpcs3.sln
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Merge branch 'master' of https://github.com/Nekotekina/rpcs3
Merge pull request #157 from Dante38490/patch-4

Update rpcs3.sln on VS 2013
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3