Title: [172106] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 172106
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 16:34:30 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r172034. <rdar://problem/17864079>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172105 => 172106)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 23:32:32 UTC (rev 172105)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 23:34:30 UTC (rev 172106)
@@ -1,5 +1,15 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r172034
+
+ 2014-08-05 Alexey Proskuryakov <a...@apple.com>
+
+ Build fix.
+
+ * UIProcess/WebContext.h:
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r172031
2014-08-05 Oliver Hunt <oli...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h (172105 => 172106)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-05 23:32:32 UTC (rev 172105)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-05 23:34:30 UTC (rev 172106)
@@ -431,7 +431,7 @@
String networkingHSTSDatabasePath() const;
String platformDefaultNetworkingHSTSDatabasePath() const;
-#if PLTFORM(IOS)
+#if PLATFORM(IOS)
String parentBundleDirectory() const;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
