Riley Testut ffb6d7b02a Merge branch 'melonDS_0.9' into develop ... # Conflicts: # Delta/Base.lproj/Settings.storyboard		2020-11-24 13:24:46 -06:00
..
Delta-Bridging-Header.h	Moves vibration logic to DeltaCore; adds taptic engine support	2016-11-28 17:09:45 -08:00
Delta.entitlements	Removes iCloud entitlement	2019-06-21 12:07:39 -07:00
GoogleService-Info.plist	Configures project to support syncing with Google Drive	2018-11-13 16:03:49 -08:00
Info.plist	Merge branch 'melonDS_0.9' into develop	2020-11-24 13:24:46 -06:00