mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-02-20 07:13:49 -07:00
dd6592698e
This is mostly a brainless merge, #ifdef-ing anything that doesn't match between the two while preserving common logic. I didn't rename any variables (although similar ones do exist), but I did change one log that was ERROR on android and NOTICE elsewhere to just always be NOTICE. Further merging will follow. |
||
|---|---|---|
| .. | ||
| ControllerEmu | ||
| ControllerInterface | ||
| ControlReference | ||
| DynamicInputTextures | ||
| CMakeLists.txt | ||
| DynamicInputTextureManager.cpp | ||
| DynamicInputTextureManager.h | ||
| GCAdapter.cpp | ||
| GCAdapter.h | ||
| GCPadStatus.h | ||
| ImageOperations.cpp | ||
| ImageOperations.h | ||
| InputConfig.cpp | ||
| InputConfig.h | ||
| InputProfile.cpp | ||
| InputProfile.h | ||
| KeyboardStatus.h | ||