Minor changes
Conflicts fixed
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
ARMv7 decoder reworked (needs more testing / fixes / optimisations). TODO: implement new ARMv7 disassembler (currently ARMv7DisAsm fully disabled), add 0x0 opcodes group.
Oops, disable my debug logs.
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
GCC build fix
Merge pull request #881 from O1L/master

ARMv7 decoder reworked.