2010-05-03 Adam Barth <abarth@webkit.org>

        Reviewed by Dimitri Glazkov.

        Add some more Chromium-specific files to gitignore
        https://bugs.webkit.org/show_bug.cgi?id=38469

        These files are generated as part of the update-webkit --chromium
        script.

        * .gitignore:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index aa472be9e61596290d03787d6ae0bad495b60070..ea786439297ca4fd5e18a73ec4fee350f6ab3162 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,11 @@ WebKitTools/Scripts/webkitpy/thirdparty/autoinstalled
 JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
 WebCore/WebCore.gyp/WebCore.xcodeproj
 WebKit/chromium/WebKit.xcodeproj
+WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
+
+# Ignore status files that manage Chromium dependencies.
+WebKit/chromium/.gclient
+WebKit/chromium/.gclient_entries
 
 # Ignore compiled java tests:
 LayoutTests/java/*.class

diff --git a/ChangeLog b/ChangeLog
index 164d85d24b66a4602dde6a0677079b8266741f08..0d2ca85895097a73a10864d66254cca7ccce0ddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-03  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add some more Chromium-specific files to gitignore
+        https://bugs.webkit.org/show_bug.cgi?id=38469
+
+        These files are generated as part of the update-webkit --chromium
+        script.
+
+        * .gitignore:
+
 2010-05-02  Geoff Levand  <geoff.levand@am.sony.com>
 
         Reviewed by Eric Seidel.