2010-07-14 Vincent Scheib <scheib@chromium.org>

        Reviewed by Kent Tamura

        Configure Git to ignore build files generated by Chromium .gyp on windows.

        Bug 42205: Chromium build files on windows not ignored by git
        https://bugs.webkit.org/show_bug.cgi?id=42205

        * .gitignore: Updated

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

diff --git a/.gitignore b/.gitignore
index ea786439297ca4fd5e18a73ec4fee350f6ab3162..277912ab9eb1db8c2f0c6c9c968d83186e2b9270 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,17 @@ autoinstall.cache.d
 WebKitTools/Scripts/webkitpy/thirdparty/autoinstalled
 
 # Ignore Chromium projects auto-generated from .gyp files:
+JavaScriptCore/JavaScriptCore.gyp/*.sln
+JavaScriptCore/JavaScriptCore.gyp/*.vcproj*
 JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
+WebCore/WebCore.gyp/*.mk
+WebCore/WebCore.gyp/*.rules
+WebCore/WebCore.gyp/*.sln
+WebCore/WebCore.gyp/*.tmp
+WebCore/WebCore.gyp/*.vcproj*
 WebCore/WebCore.gyp/WebCore.xcodeproj
+WebKit/chromium/*.sln
+WebKit/chromium/*.vcproj*
 WebKit/chromium/WebKit.xcodeproj
 WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
 

diff --git a/ChangeLog b/ChangeLog
index b04876ad3fc75e40bd2659337f5e0de80713b375..124e86ce68b600c863323f3eb4b0bcd2cacc33b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-14  Vincent Scheib  <scheib@chromium.org>
+
+        Reviewed by Kent Tamura
+
+        Configure Git to ignore build files generated by Chromium .gyp on windows.
+
+        Bug 42205: Chromium build files on windows not ignored by git
+        https://bugs.webkit.org/show_bug.cgi?id=42205
+        
+        * .gitignore: Updated
+
 2010-07-13  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r63262.