2010-12-14 Ryosuke Niwa <rniwa@webkit.org>

        Reviewed by Eric Seidel.

        [git].DS_Store should be in .gitignore
        https://bugs.webkit.org/show_bug.cgi?id=51065

        Added .DS_Store to .gitignore.

        * .gitignore:

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

diff --git a/.gitignore b/.gitignore
index 823a467..5348d07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pbxuser
 *.perspective*
 *.pyc
+.DS_Store
 build/
 /WebKitBuild/
 autoinstall.cache.d

diff --git a/ChangeLog b/ChangeLog
index 85e5110..b66bcc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [git].DS_Store should be in .gitignore
+        https://bugs.webkit.org/show_bug.cgi?id=51065
+
+        Added .DS_Store to .gitignore.
+
+        * .gitignore:
+
 2010-12-14  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 
         Reviewed by Eric Seidel.