[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Mon Feb 21 00:07:06 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 2cbd32ac9847d3536ede2b5aec7da1af699f8ae6
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 06:09:54 2011 +0000
2011-01-27 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Unreviewed buildfix for SnowLeopard Intel Debug.
Fix macro redefinition by not including config.h.
Revert previous change in WebPageProxyCF.cpp.
* UIProcess/cf/WebPageProxyCF.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7dd0cd4..725b918 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Unreviewed buildfix for SnowLeopard Intel Debug.
+
+ Fix macro redefinition by not including config.h.
+
+ Revert previous change in WebPageProxyCF.cpp.
+
+ * UIProcess/cf/WebPageProxyCF.cpp:
+
2011-01-27 Greg Coletta <greg.coletta at nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
index 5e2060c..c1b7971 100644
--- a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
+++ b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
@@ -23,7 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
#include "WebPageProxy.h"
#include "DataReference.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list