[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 48bdbbe105ba3aecf41e977d32ce89a2154d6225
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 01:34:46 2010 +0000

    2010-02-26  Arno Renevier  <arno at renevier.net>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Gtk] ignore WebKit/gtk/docs/GNUmakefile.in in .gitignore
            https://bugs.webkit.org/show_bug.cgi?id=35424
    
            * .gitignore:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 607a22e..f2939cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ WebKit/chromium/WebKit.xcodeproj
 /autotoolsconfig.h.in
 /configure
 /GNUmakefile.in
+/WebKit/gtk/docs/GNUmakefile.in
 /gtk-doc.make
 /INSTALL
 /README
diff --git a/ChangeLog b/ChangeLog
index 2987787..8428d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26  Arno Renevier  <arno at renevier.net>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Gtk] ignore WebKit/gtk/docs/GNUmakefile.in in .gitignore
+        https://bugs.webkit.org/show_bug.cgi?id=35424
+
+        * .gitignore:
+
 2010-02-24  Sam Kerner  <skerner at chromium.org>
 
         Reviewed by Darin Fisher.

-- 
WebKit Debian packaging