Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
This commit is contained in:
John Rommel Estropia committed 2016-05-02 18:22:43 +08:00
commit 099dcfab68
5 files changed
+10 -8

No files matched your search

+1 -1
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