[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
bweinstein at apple.com
bweinstein at apple.com
Wed Apr 7 23:45:23 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a9338a70c8fa81eee6ef3532fd70c4f0c3547ef6
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 17 18:37:33 2009 +0000
Touch files to try to fix the build.
Reviewed by NOBODY - Build Fix.
* Interfaces/IWebInspector.idl:
* Interfaces/WebKit.idl:
* WebKit.vcproj/Interfaces.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 7bcf720..49930a5 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-17 Brian Weinstein <bweinstein at apple.com>
+
+ Reviewed by NOBODY - Build Fix.
+
+ Touch files to try to fix the build.
+
+ * Interfaces/IWebInspector.idl:
+ * Interfaces/WebKit.idl:
+ * WebKit.vcproj/Interfaces.vcproj:
+
2009-11-17 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebKit/win/Interfaces/IWebInspector.idl b/WebKit/win/Interfaces/IWebInspector.idl
index 4d0d96c..4523205 100644
--- a/WebKit/win/Interfaces/IWebInspector.idl
+++ b/WebKit/win/Interfaces/IWebInspector.idl
@@ -54,6 +54,7 @@ interface IWebInspector : IUnknown
HRESULT isJavaScriptProfilingEnabled(BOOL* isProfilingEnabled);
HRESULT setJavaScriptProfilingEnabled(BOOL enabled);
+
HRESULT isTimelineProfilingEnabled(BOOL* isEnabled);
HRESULT setTimelineProfilingEnabled(BOOL enabled);
}
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index e72141f..4bb5d6f 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -278,3 +278,4 @@ library WebKit
[default] interface IWebScriptWorld;
}
}
+
diff --git a/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index b9509d6..ad82d94 100644
--- a/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -944,7 +944,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\Interfaces\IWebInspector.idl"
+ RelativePath="..\Interfaces\IWebInspector.idl"
>
<FileConfiguration
Name="Debug|Win32"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list