Merge branch 'master' of github.com:hrydgard/ppsspp
Fix black screen in non-buffered rendering mode
Fix multiple compilation issues for all platforms.
Fix typo in Common.pro.
Merge pull request #2607 from Kingcom/Debugger

Debug interface improvements
Merge pull request #2606 from thedax/master

Fix multiple compilation errors for all platforms.
Merge branch 'master' of github.com:hrydgard/ppsspp
Fix emu screen trashing legacy input
Make key map defaults match old mapping
Make key map screen hint which map conflicts
Update Windows' keyboard input in preparation for eventual key remapping. Might need a bit more work, but for now, all keyboard functionality should be restored.
Merge pull request #2613 from thedax/updateWinKeyboardToKeyMapping

Update Windows' keyboard input in preparation for eventual key remapping
Update native
Fix wrong thread id when resuming after interrupt.

Who knows what kind of havoc this was causing.
Merge pull request #2614 from unknownbrackets/scheduling

Fix wrong thread id when resuming after interrupt.
Update sceJpeg.cpp
Update FunctionWrappers.h
Merge branch 'master' of github.com:hrydgard/ppsspp
Fix forgetting pressed keys
Fix typo