summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-20 16:13:48 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-09-20 16:13:48 +0200
commit0b3dc81d9701aea106543b49bde511a5697cdd6e (patch)
tree1382a17542d8ca4d0e054b9b143021d8f471e33b /Source/WebKit/chromium
parent6dbcd09121fe266c7704a524b5cbd7f2754659c0 (diff)
downloadqtwebkit-0b3dc81d9701aea106543b49bde511a5697cdd6e.tar.gz
Imported WebKit commit 6dbad7b03986b50773637200cddddeeeb92745cc (http://svn.webkit.org/repository/webkit/trunk@129129)
Another update that should fix the initial build in the CI system
Diffstat (limited to 'Source/WebKit/chromium')
-rw-r--r--Source/WebKit/chromium/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 08b5cd5cf..7d7233c7d 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2012-09-20 Mike West <mkwst@google.com>
+
+ [chromium] Adding the 'google_apis' directory to .gitignore.
+ https://bugs.webkit.org/show_bug.cgi?id=97187
+
+ Reviewed by Jochen Eisinger.
+
+ 'chromium/google_apis' should be ignored, as it's not in the git repo.
+
+ * .gitignore:
+
2012-09-19 Adam Barth <abarth@webkit.org>
Remove webkitPostMessage