Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
This commit is contained in:
John Rommel Estropia
2016-05-02 18:22:43 +08:00
5 changed files with 10 additions and 8 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.2"
s.dependency "GCDKit", "1.2.4"
end