mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-05-29 07:16:33 +00:00
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java |
||
---|---|---|
.. | ||
strings.xml |
Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java |
||
---|---|---|
.. | ||
strings.xml |