# Conflicts: # .gitmodules # Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme # Delta.xcworkspace/contents.xcworkspacedata # Delta/Base.lproj/Settings.storyboard # Delta/Settings/SettingsViewController.swift |
||
|---|---|---|
| .. | ||
| DeltaCore@a721967855 | ||
| GBADeltaCore@21ba9850fb | ||
| GBCDeltaCore@473474019b | ||
| NESDeltaCore@d83e51d060 | ||
| SNESDeltaCore@5f341a67ad | ||