2011-04-04 Jon Lee <jonlee@apple.com>

        Reviewed by Eric Seidel.

        add some directories to .gitignore (and svn:ignore) when opening projects in xcode4
        https://bugs.webkit.org/show_bug.cgi?id=57646

        * .gitignore: added xcode 4 related project and workspace directories that are not needed for checkin

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

diff --git a/.gitignore b/.gitignore
index 30f0cdcbf0f396f0bbb09821702917bbd656fc4c..e412110c2583fcfa4ffe800ee560e324dfaeffb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ build/
 /WebKitBuild/
 autoinstall.cache.d
 Tools/Scripts/webkitpy/thirdparty/autoinstalled
+project.xcworkspace
+xcuserdata
 
 # Ignore common tool auto-generated files.
 .gdb_history

diff --git a/ChangeLog b/ChangeLog
index 32145abfa249a0c7fa51021cee236e282ae9e2f7..eb52cd60a12fa07cf27eca973f625699581b45ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-04  Jon Lee  <jonlee@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        add some directories to .gitignore (and svn:ignore) when opening projects in xcode4
+        https://bugs.webkit.org/show_bug.cgi?id=57646
+
+        * .gitignore: added xcode 4 related project and workspace directories that are not needed for checkin
+
 2011-03-31  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Martin Robinson.