Riley Testut d03cc90a29 Merge branch 'feature/nes' into develop ... # Conflicts: # .gitmodules # Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme # Delta.xcworkspace/contents.xcworkspacedata # Delta/Base.lproj/Settings.storyboard # Delta/Settings/SettingsViewController.swift		2019-02-06 15:40:11 -08:00
..
App Icon Shortcuts	Updates deployment target to iOS 12.0	2018-11-12 14:51:29 -08:00
Controller Skins	Updates deployment target to iOS 12.0	2018-11-12 14:51:29 -08:00
Controllers	Adds support for NES games	2019-02-01 12:44:32 -08:00
Syncing	Displays correct local modification date in RecordSyncStatusViewController	2019-01-29 15:11:25 -08:00
Settings.swift	Merge branch 'feature/nes' into develop	2019-02-06 15:40:11 -08:00
SettingsViewController.swift	Merge branch 'feature/nes' into develop	2019-02-06 15:40:11 -08:00