UseMediaEngine should be grey when emulator running
Update ppsspp.rc
Merge pull request #976 from raven02/patch-6

UseMediaEngine should be grey when emulator running
Add UI for UseMediaEngine for Android
Merge pull request #977 from raven02/patch-7

Add UI for UseMediaEngine for Android
Sonic's ArmEmitter changes (cross-project merge from Dolphin)
Attempt at fixing JIT on iOS. Can only have PROT_WRITE or PROT_EXEC enabled. So toggle between them as needed.
Validate addresses when analyzing atrac.
Handle dispatch suspend/resume slightly better.
Merge pull request #982 from unknownbrackets/atrac-minor

Validate addresses when analyzing atrac
Merge pull request #983 from unknownbrackets/scheduling

Handle dispatch suspend/resume slightly better
Merge pull request #975 from MrYadro/master

Fixed Russian QT translation & added it to resources.qrc
Don't lock armjit memory before aligning code.
Merge pull request #984 from unknownbrackets/ios

Don't lock armjit memory before aligning code
iOS: Protect/unprotect isn't needed for jit.
Re-read R9 on iOS each time.

There's maybe a better way.  Anyhow, seems to run.
Merge pull request #985 from unknownbrackets/ios

Fix jit on iOS
Fixed Russian localization for Qt