[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[girish at forwardbias.in]

The following commit has been merged in the webkit-1.2 branch:
commit 5462dba5e179422ecf18c800c9849d1c66bd9a18
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 24 19:41:36 2009 +0000

    Reviewed by Gustavo Noronha.
    
    Doc : QGraphicsWebView::zoomFactor was introduced in 4.6.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 031d8f8..82aede5 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -508,7 +508,6 @@ QIcon QGraphicsWebView::icon() const
 
 /*!
     \property QGraphicsWebView::zoomFactor
-    \since 4.5
     \brief the zoom factor for the view
 */
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b4744f3..4029029 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-24  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Gustavo Noronha.
+
+        Doc : QGraphicsWebView::zoomFactor was introduced in 4.6.
+        
+        * Api/qgraphicswebview.cpp:
+
 2009-12-22  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Rubber-stamped by Holger Freyther.

-- 
WebKit Debian packaging