Merge remote-tracking branch 'UrbanApps/master'

# Conflicts:
#	Source/Armchair.swift
This commit is contained in:
whitepixelstudios
2017-07-31 11:50:17 +10:00
parent 068c4b92c1
commit ea3ab5ed28
3 changed files with 19 additions and 6 deletions
+1 -2
View File
@@ -725,7 +725,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
@@ -747,7 +746,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
};
name = Release;
};