Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	CoreStore/CartFile
#	README.md
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Logging/CoreStore+Logging.swift
This commit is contained in:
John Rommel Estropia
2016-03-23 21:23:08 +09:00
5 changed files with 5 additions and 4 deletions

View File

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
s.dependency "GCDKit", "1.2.0"
s.dependency "GCDKit", "1.2.1"
end