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
..
GamesDatabase.storyboard	Adds support for 3D Touch app icon game shortcuts	2018-01-04 14:17:59 -06:00
LaunchScreen.storyboard	Updates project structure to match and automatically keep in sync with file system	2017-10-12 15:54:55 -07:00
Main.storyboard	Adds temporary Sync button to initiate syncs	2018-11-14 19:01:34 -08:00
PauseMenu.storyboard	Adds support for 3D Touch app icon game shortcuts	2018-01-04 14:17:59 -06:00
PausePresentationControllerContentView.xib	Updates project structure to match and automatically keep in sync with file system	2017-10-12 15:54:55 -07:00
Settings.storyboard	Merge branch 'feature/nes' into develop	2019-02-06 15:40:11 -08:00