2010-02-26 Arno Renevier <arno@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 607a22e76a40e56a5e8bf49568e66016b556ea3b..f2939cd420a2741d6b0d4a9d3c4bcbe798866b33 100644 (file)
--- 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 2987787a93854926b3686c8f9c74ead8da560dd1..8428d7a2ab252aac7581a575e1ff3a6f891e3133 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26  Arno Renevier  <arno@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@chromium.org>
 
         Reviewed by Darin Fisher.