mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-22 22:47:27 +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 | ||