diff --git a/.gitignore b/.gitignore index 2a6c8d007f4ce21d874627bb8dddbd0093b2bdc1..ac8cf5cdddeaa4e28f79a2f88ebef8153162a98f 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,6 @@ LayoutTests/java/*.class /WebKitLibraries/win/lib/libxslt.lib /WebKitLibraries/win/lib/pthreadVC2.lib /WebKitLibraries/win/lib/zdll.lib + +# Ignore files generated by the Qt build-system: +Source/qtwebkitversion.h diff --git a/ChangeLog b/ChangeLog index 994c79c1e82009e22808c86dffa9b112a4425f85..2452c24891ae5a11368af1602209bfaeaa23cfa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-12-05 Alexander Færøy + + [Qt] Add Source/qtwebkitversion.h to .gitignore + https://bugs.webkit.org/show_bug.cgi?id=73823 + + Reviewed by Tor Arne Vestbø. + + * .gitignore: + 2011-12-03 Dan Winship [GTK] Update required libsoup version