mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 02:29:51 +01:00
# Conflicts: # Core/SaveState.cpp # UI/ControlMappingScreen.cpp # UI/CwCheatScreen.cpp # UI/GameSettingsScreen.cpp # UI/PauseScreen.cpp # android/assets/ppge_atlas.zim # android/assets/ppge_atlas_luna.meta # android/assets/ui_atlas.zim # android/assets/ui_atlas_luna.meta # android/res/drawable-hdpi/ic_launcher.png # android/res/drawable-ldpi/ic_launcher.png # android/res/drawable-mdpi/ic_launcher.png # android/res/drawable-xhdpi/ic_launcher.png # android/res/drawable-xhdpi/tv_banner.png # android/res/drawable-xxhdpi/ic_launcher.png # android/res/drawable/ic_banner.png # assets/ppge_atlas.zim # assets/ppge_atlas_luna.meta # assets/ui_atlas.zim # assets/ui_atlas_luna.meta