[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[snej at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit a55a24e97a1cf819a6648c564700de416a68ea73
Author: snej at chromium.org <snej at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 25 00:06:17 2009 +0000

    Add Chromium's gyp-generated Xcode projects to the .gitignore file.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index b9595b3..27cc396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
 *.pyc
 build/
 /WebKitBuild/
+
+# Ignore Chromium projects auto-generated from .gyp files:
+JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
+WebCore/WebCore.gyp/WebCore.xcodeproj
+WebKit/chromium/WebKit.xcodeproj
diff --git a/ChangeLog b/ChangeLog
index 77067f5..cd33e03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-24  Jens Alfke  <snej at chromium.org>
+
+        Reviewed by David Levin.
+
+        Ignore Chromium's Xcode projects that are auto-generated from .gyp files.
+        https://bugs.webkit.org/show_bug.cgi?id=31847
+        
+        * .gitignore:  Add three .xcodeproj files.
+
 2009-11-09  Priit Laes  <plaes at plaes.org>
 
         Reviewed by Oliver Hunt.

-- 
WebKit Debian packaging