[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:31:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0322a0dddacae5e35d4dccdeaf6c8e96a01e50e4
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 18 00:34:04 2010 +0000
Fix Windows and Qt builds.
* Shared/qt/PlatformCertificateInfo.h:
(WebKit::PlatformCertificateInfo::decode):
* Shared/win/PlatformCertificateInfo.h:
(WebKit::PlatformCertificateInfo::decode):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67763 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c16926f..1c2b850 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-17 Sam Weinig <sam at webkit.org>
+
+ Fix Windows and Qt builds.
+
+ * Shared/qt/PlatformCertificateInfo.h:
+ (WebKit::PlatformCertificateInfo::decode):
+ * Shared/win/PlatformCertificateInfo.h:
+ (WebKit::PlatformCertificateInfo::decode):
+
2010-09-17 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/qt/PlatformCertificateInfo.h b/WebKit2/Shared/qt/PlatformCertificateInfo.h
index 1a407d1..32776f7 100644
--- a/WebKit2/Shared/qt/PlatformCertificateInfo.h
+++ b/WebKit2/Shared/qt/PlatformCertificateInfo.h
@@ -48,6 +48,7 @@ public:
static bool decode(CoreIPC::ArgumentDecoder*, PlatformCertificateInfo&)
{
+ return true;
}
};
diff --git a/WebKit2/Shared/win/PlatformCertificateInfo.h b/WebKit2/Shared/win/PlatformCertificateInfo.h
index 8d76b27..32776f7 100644
--- a/WebKit2/Shared/win/PlatformCertificateInfo.h
+++ b/WebKit2/Shared/win/PlatformCertificateInfo.h
@@ -48,7 +48,7 @@ public:
static bool decode(CoreIPC::ArgumentDecoder*, PlatformCertificateInfo&)
{
-
+ return true;
}
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list