mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-11-11 00:29:23 +01:00
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java