John Estropia 36e6e4a8b9 Merge branch 'develop' into corestore2_develop ...

# Conflicts:
#	Cartfile
#	Cartfile.resolved
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStore/Migrating/DataStack+Migration.swift
#	CoreStore/Setting Up/DataStack.swift
#	README.md
#	Sources/Info.plist

2016-03-24 15:09:36 +09:00

..

Convenience Helpers

Swift Package Manager support

2016-03-09 17:47:46 +09:00

Fetching and Querying

Swift Package Manager support

2016-03-09 17:47:46 +09:00

Importing Data

Swift Package Manager support

2016-03-09 17:47:46 +09:00

Internal

Merge branch 'develop' into corestore2_develop

2016-03-24 15:09:36 +09:00

Logging

Changed error-handling method to rely on new enum CoreStoreError instead of NSErrors

2016-03-16 07:56:19 +09:00

Migrating

Merge branch 'develop' into corestore2_develop

2016-03-24 15:09:36 +09:00

Observing

Swift Package Manager support

2016-03-09 17:47:46 +09:00

Saving and Processing

Changed error-handling method to rely on new enum CoreStoreError instead of NSErrors

2016-03-16 07:56:19 +09:00

Setting Up

Merge branch 'develop' into corestore2_develop

2016-03-24 15:09:36 +09:00

CoreStore.h

Swift Package Manager support

2016-03-09 17:47:46 +09:00

CoreStore.swift

Swift Package Manager support

2016-03-09 17:47:46 +09:00

CoreStoreError.swift

Changed error-handling method to rely on new enum CoreStoreError instead of NSErrors

2016-03-16 07:56:19 +09:00

Info.plist

Swift Package Manager support

2016-03-09 17:47:46 +09:00