Title: [169191] releases/WebKitGTK/webkit-2.4/Tools
- Revision
- 169191
- Author
- [email protected]
- Date
- 2014-05-22 01:09:46 -0700 (Thu, 22 May 2014)
Log Message
Unreviewed. Fix the build after r168707.
* Scripts/webkitdirs.pm:
(buildAutotoolsProject): Fix merge conflicts not handled in r168707.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (169190 => 169191)
--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-22 06:44:44 UTC (rev 169190)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-22 08:09:46 UTC (rev 169191)
@@ -1,3 +1,10 @@
+2014-05-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix the build after r168707.
+
+ * Scripts/webkitdirs.pm:
+ (buildAutotoolsProject): Fix merge conflicts not handled in r168707.
+
2014-05-07 Carlos Garcia Campos <[email protected]>
[SOUP] TLSErrors do not cause page load to fail when not ignored
Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (169190 => 169191)
--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-22 06:44:44 UTC (rev 169190)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-22 08:09:46 UTC (rev 169191)
@@ -1857,7 +1857,6 @@
if ($project eq 'WebKit' && !isCrossCompilation() && !($noWebKit1 && $noWebKit2)) {
my @docGenerationOptions = ("$sourceDir/Tools/gtk/generate-gtkdoc", "--skip-html");
- push(@docGenerationOptions, productDir());
unshift(@docGenerationOptions, jhbuildWrapperPrefixIfNeeded());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
