Merge branch 'master' into prototype/propertyWrapperFields

This commit is contained in:
John Estropia committed 2020-02-08 09:47:35 +09:00
commit 38e9878c04
5 files changed
+12 -4

No files matched your search

+2 -2
View File
@@ -3403,7 +3403,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.0.3;
MARKETING_VERSION = 7.0.4;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3426,7 +3426,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.0.3;
MARKETING_VERSION = 7.0.4;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,