John Rommel Estropia 094703155c Merge branch 'master' into prototype/Swift_4_0 ...

# Conflicts:
#	.swift-version

2017-10-13 08:14:20 +09:00

..

project.xcworkspace

Fixes #98 (deadlock when merge happens while main queue is querying)

2016-09-29 14:47:51 -04:00

xcshareddata/xcschemes

added required settings

2017-09-20 00:09:57 +09:00

project.pbxproj

Merge branch 'master' into prototype/Swift_4_0

2017-10-13 08:14:20 +09:00