Diff
Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (194230 => 194231)
--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2015-12-17 22:11:59 UTC (rev 194231)
@@ -1,3 +1,13 @@
+2015-12-17 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r191305.
+
+ 2015-10-19 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the iOS build
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r191299.
Modified: branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (194230 => 194231)
--- branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-12-17 22:11:59 UTC (rev 194231)
@@ -118,9 +118,11 @@
ENABLE_INTL = ;
+ENABLE_IOS_GESTURE_EVENTS = ;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS = ;
ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194230 => 194231)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-17 22:11:59 UTC (rev 194231)
@@ -1,3 +1,13 @@
+2015-12-17 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r191305.
+
+ 2015-10-19 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the iOS build
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r194125.
Modified: branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (194230 => 194231)
--- branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-12-17 22:11:59 UTC (rev 194231)
@@ -118,9 +118,11 @@
ENABLE_INTL = ;
+ENABLE_IOS_GESTURE_EVENTS = ;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS = ;
ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (194230 => 194231)
--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-12-17 22:11:59 UTC (rev 194231)
@@ -1,3 +1,13 @@
+2015-12-17 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r191305.
+
+ 2015-10-19 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the iOS build
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r191299.
Modified: branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (194230 => 194231)
--- branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-12-17 22:11:59 UTC (rev 194231)
@@ -118,9 +118,11 @@
ENABLE_INTL = ;
+ENABLE_IOS_GESTURE_EVENTS = ;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS = ;
ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (194230 => 194231)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-17 22:11:59 UTC (rev 194231)
@@ -1,3 +1,13 @@
+2015-12-17 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r191305.
+
+ 2015-10-19 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the iOS build
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r194205.
Modified: branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (194230 => 194231)
--- branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-12-17 21:56:10 UTC (rev 194230)
+++ branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-12-17 22:11:59 UTC (rev 194231)
@@ -118,9 +118,11 @@
ENABLE_INTL = ;
+ENABLE_IOS_GESTURE_EVENTS = ;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS = ;
ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
