John Rommel Estropia db5b8ca702 Merge branch 'develop' into swift3_develop ...

# Conflicts:
#	Cartfile.resolved
#	Carthage/Checkouts/GCDKit
#	CoreStoreTests/ErrorTests.swift
#	Sources/Fetching and Querying/Concrete Clauses/Select.swift
#	Sources/ObjectiveC/CSError.swift

2016-07-22 00:47:03 +09:00

..

project.xcworkspace

migration utilities (beta), swift 2 conversion

2015-07-07 08:03:46 +09:00

xcshareddata/xcschemes

WIP: segfault

2016-07-20 08:12:04 +09:00

project.pbxproj

Merge branch 'develop' into swift3_develop

2016-07-22 00:47:03 +09:00