JavaScriptCore-7600.1.4.11.8.tar.gz

diff --git a/ChangeLog b/ChangeLog
index 031e26160c314cedc36e1eff7f8c4b9d39ef8d2f..35c65f46bb6d3f2a4e627dfe63d5ae929b461a5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-09-15  Babak Shafiei  <bshafiei@apple.com>
+
+        <rdar://problem/18327341> Disable Web Timing on this branch.
+
+        Reviewed originally by Sam Weinig.
+
+        Disable:
+        - WEB_TIMING
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-08-03  Babak Shafiei  <bshafiei@apple.com>
 
         Merge patch for <rdar://problem/17887398>.

diff --git a/Configurations/FeatureDefines.xcconfig b/Configurations/FeatureDefines.xcconfig
index be3d543c2dc0407845eb26349e0939450278e343..e8e2332fcc63cfcd74af27add9f89859ee8ffa33 100644 (file)
--- a/Configurations/FeatureDefines.xcconfig
+++ b/Configurations/FeatureDefines.xcconfig
@@ -235,8 +235,8 @@ ENABLE_WEB_TIMING_macosx = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VERSION_
 ENABLE_WEB_TIMING_macosx_1080 = ;
 ENABLE_WEB_TIMING_macosx_1090 = ;
 ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphoneos = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphonesimulator = $(ENABLE_WEB_TIMING_iphoneos);
+ENABLE_WEB_TIMING_iphoneos = ;
+ENABLE_WEB_TIMING_iphonesimulator = ;
 
 ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
 ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;

diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig
index 41ac13889e116422b67406bd3be42f6dbfa78e71..963f195bd000af3a3a0d4fab4b06ba66b6b9c9f3 100644 (file)
--- a/Configurations/Version.xcconfig
+++ b/Configurations/Version.xcconfig
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 600;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 9;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+MICRO_VERSION = 11;
+NANO_VERSION = 8;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));