[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

joepeck at webkit.org joepeck at webkit.org
Mon Dec 27 16:25:44 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e5d344abbdbf70308638166a285df5dbba40c66b
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 01:36:41 2010 +0000

    2010-12-20  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Darin Adler.
    
            Update .gitattributes for WebKitTools -> Tools change
            https://bugs.webkit.org/show_bug.cgi?id=51365
    
            * .gitattributes: WebKitTools -> Tools rename. Removed no longer existing file references.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index a8f07c5..4ad311d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,7 @@ mac/*.h diff=objcppheader
 objc/*.h diff=objcppheader
 */objc/*.h diff=objcppheader
 */*/objc/*.h diff=objcppheader
-WebKitTools/WebKitLauncher/*.h diff=objcppheader
+Tools/WebKitLauncher/*.h diff=objcppheader
 
 *.vcproj eol=crlf
 *.vsprops eol=crlf
@@ -235,14 +235,10 @@ WebKitSite/blog/wp-includes/js/scriptaculous/MIT-LICENSE -crlf
 WebKitSite/blog/wp-includes/js/swfupload/plugins/swfupload.speed.js -crlf
 WebKitSite/blog/wp-includes/js/tinymce/license.txt -crlf
 WebKitSite/perf/slickspeed/frameworks/DomQuery.js -crlf
-WebKitTools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
-WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.def -crlf
-WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc -crlf
-WebKitTools/FindSafari/Safari.exe.manifest -crlf
-WebKitTools/Scripts/webkitpy/mock.py -crlf
-WebKitTools/WinLauncher/WinLauncher.h -crlf
-WebKitTools/record-memory-win/main.cpp -crlf
-WebKitTools/TestResultServer/index.yaml -crlf
-WebKitTools/BuildSlaveSupport/win/kill-old-processes -crlf
-WebKitTools/MiniBrowser/win/MiniBrowser.rc -crlf
-
+Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
+Tools/FindSafari/Safari.exe.manifest -crlf
+Tools/WinLauncher/WinLauncher.h -crlf
+Tools/record-memory-win/main.cpp -crlf
+Tools/TestResultServer/index.yaml -crlf
+Tools/BuildSlaveSupport/win/kill-old-processes -crlf
+Tools/MiniBrowser/win/MiniBrowser.rc -crlf
diff --git a/ChangeLog b/ChangeLog
index e4fa3e6..f9446b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-20  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Update .gitattributes for WebKitTools -> Tools change
+        https://bugs.webkit.org/show_bug.cgi?id=51365
+
+        * .gitattributes: WebKitTools -> Tools rename. Removed no longer existing file references.
+
 2010-12-20  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list