Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 39 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/WebKit/ChangeLog b/src/3rdparty/webkit/WebKit/ChangeLog
index f07a75c..cabdf46 100644
--- a/src/3rdparty/webkit/WebKit/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/ChangeLog
@@ -1,3 +1,42 @@
+2009-07-10  Adam Roben  <aroben@apple.com>
+
+        Sort all our Xcode projects
+
+        Accomplished using sort-Xcode-project-file.
+
+        Requested by Dave Kilzer.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
+2009-07-02  Adam Roben  <aroben@apple.com>
+
+        Fix warnings from update-webkit-localizable-strings
+
+        Rubber-stamped by Eric Carlson.
+
+        * English.lproj/Localizable.strings: Updated.
+
+2009-07-02  Adam Roben  <aroben@apple.com>
+
+        Update StringsNotToBeLocalized.txt for (not so) recent changes
+
+        Bug 26926: StringsNotToBeLocalized.txt is out-of-date
+        <https://bugs.webkit.org/show_bug.cgi?id=26926>
+
+        Reviewed by John Sullivan.
+
+        * StringsNotToBeLocalized.txt:
+
+2009-07-02  Pierre d'Herbemont  <pdherbemont@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/6518119>
+
+        Add localized strings for media controller status messages.
+
+        * English.lproj/Localizable.strings: Localized text.
+
 2009-06-08  Dan Bernstein  <mitz@apple.com>
 
         Rubber-stamped by Mark Rowe.