[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b39daa911edcdc28f3fd982754dd14f4ca9541dc
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 06:35:38 2010 +0000

    2010-11-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by David Levin.
    
            Add WebKit2 VisualStudio files to .gitattributes
            https://bugs.webkit.org/show_bug.cgi?id=49969
    
            * .gitattributes:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index 1dddd2f..06b03f9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -252,6 +252,15 @@ WebKit/win/WebKit.vcproj/WebKit.sln -crlf
 WebKit/win/WebKit.vcproj/WebKit.submit.sln -crlf
 WebKit/win/WebKit.vcproj/WebKit.vcproj -crlf
 WebKit/win/WebKit.vcproj/WebKitGUID.vcproj -crlf
+WebKit2/win/WebKit2.vcproj -crlf
+WebKit2/win/WebKit2Apple.vsprops -crlf
+WebKit2/win/WebKit2CFLite.vsprops -crlf
+WebKit2/win/WebKit2Common.vsprops -crlf
+WebKit2/win/WebKit2DirectX.vsprops -crlf
+WebKit2/win/WebKit2Generated.vcproj -crlf
+WebKit2/win/WebKit2GeneratedCommon.vsprops -crlf
+WebKit2/win/WebKit2WebProcess.vcproj -crlf
+WebKit2/win/WebKit2WebProcessCommon.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/WinCairo.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/cURL.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops -crlf
diff --git a/ChangeLog b/ChangeLog
index 5565063..eb4e671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by David Levin.
+
+        Add WebKit2 VisualStudio files to .gitattributes
+        https://bugs.webkit.org/show_bug.cgi?id=49969
+
+        * .gitattributes:
+
 2010-11-19  Mihai Parparita  <mihaip at chromium.org>
 
         Add recent upstream Chromium dependencies to .gitignore.

-- 
WebKit Debian packaging