[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 416aed1a8bd1ea17190771f5ee4cecadc977cd31
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 19 15:16:01 2009 +0000

    2009-12-19  Evan Martin  <evan at chromium.org>
    
            Reviewed by Gustavo Noronha Silva.
    
            Add a couple of WebKitGtk files to .gitignore.
    
            * .gitignore:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 27cc396..d0fe9ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,15 @@ build/
 JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
 WebCore/WebCore.gyp/WebCore.xcodeproj
 WebKit/chromium/WebKit.xcodeproj
+
+# Though the GTK build builds in a subdirectory, autogen.sh still deposits
+# a few files into the source tree.
+/aclocal.m4
+/autom4te.cache
+/autotools
+/autotoolsconfig.h.in
+/configure
+/GNUmakefile.in
+/gtk-doc.make
+/INSTALL
+/README
diff --git a/ChangeLog b/ChangeLog
index 02e0c35..606dc10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-19  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Add a couple of WebKitGtk files to .gitignore.
+
+        * .gitignore:
+
 2009-12-18  Benjamin Otte  <otte at gnome.org>
 
         Reviewed by Xan Lopez.

-- 
WebKit Debian packaging