2010-09-07 Arno Renevier <arno@renevier.net>

        Reviewed by Holger Freyther.

        gitignore *~ files and gtk *.pot files
        https://bugs.webkit.org/show_bug.cgi?id=45129

        * .gitignore:

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

diff --git a/.gitignore b/.gitignore
index a2c789bc65fcbf3fe82fa379c69055659e50a6e3..5d96ad2a6e9bce8f2dc3be4f9b67a6bac3b6ea0b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ WebKitTools/Scripts/webkitpy/thirdparty/autoinstalled
 # Ignore common tool auto-generated files.
 .gdb_history
 tags
+*~
 
 # Ignore Chromium projects auto-generated from .gyp files:
 JavaScriptCore/JavaScriptCore.gyp/*.Makefile
@@ -80,6 +81,7 @@ LayoutTests/java/*.class
 /configure
 /GNUmakefile.in
 /WebKit/gtk/docs/GNUmakefile.in
+/WebKit/gtk/po/*.pot
 /gtk-doc.make
 /INSTALL
 /README

diff --git a/ChangeLog b/ChangeLog
index 436e4854afcb55b14b59cf3222d9b2ddcb05fff6..940fd4412af6121f2714503476f4115bcee6e461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-07  Arno Renevier  <arno@renevier.net>
+
+        Reviewed by Holger Freyther.
+
+        gitignore *~ files and gtk *.pot files
+        https://bugs.webkit.org/show_bug.cgi?id=45129
+
+        * .gitignore:
+
 2010-09-04  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.