[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

eric at webkit.org eric at webkit.org
Wed Feb 10 22:16:30 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit f6d23db110ee34433d6e75a424c871aa35f4b064
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 15:09:17 2010 +0000

    2010-02-05  Simon Hausmann  <simon.hausmann at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            Add .gitattributes file to tell git about files with Windows linefeeds
            https://bugs.webkit.org/show_bug.cgi?id=34645
    
            On Windows git defaults to "true" for core.autocrlf, meaning all text
            files in the working directory are converted from CRLF to LF on checkin
            time. Some files present in the repository have been checked in with
            CRLF linefeeds and git should not try to convert them. The added
            .gitattributes file tells git to not do any CRLF conversion.
    
            * .gitattributes: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54423 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a3ea8b1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,271 @@
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj -crlf
+JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln -crlf
+JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj -crlf
+JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops -crlf
+JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj -crlf
+JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops -crlf
+JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj -crlf
+LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg -crlf
+LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg -crlf
+LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg -crlf
+LayoutTests/editing/execCommand/align-in-span.html -crlf
+LayoutTests/editing/selection/drag-start-event-client-x-y.html -crlf
+LayoutTests/fast/backgrounds/background-position-rounding.html -crlf
+LayoutTests/fast/backgrounds/repeat/resources/background-repeat-shorthand.js -crlf
+LayoutTests/fast/backgrounds/repeat/resources/margin-shorthand.js -crlf
+LayoutTests/fast/block/float/clamped-right-float.html -crlf
+LayoutTests/fast/block/positioning/absolute-with-html-border-quirks.html -crlf
+LayoutTests/fast/block/positioning/absolute-with-html-border-strict.html -crlf
+LayoutTests/fast/canvas/script-tests/canvas-gradient-without-path.js -crlf
+LayoutTests/fast/css/color-quirk.html -crlf
+LayoutTests/fast/css/color-strict.html -crlf
+LayoutTests/fast/css/css1_forward_compatible_parsing.html -crlf
+LayoutTests/fast/css/empty-pseudo-class.html -crlf
+LayoutTests/fast/css/first-child-pseudo-class.html -crlf
+LayoutTests/fast/css/first-of-type-pseudo-class.html -crlf
+LayoutTests/fast/css/last-child-pseudo-class.html -crlf
+LayoutTests/fast/css/last-of-type-pseudo-class.html -crlf
+LayoutTests/fast/css/only-child-pseudo-class.html -crlf
+LayoutTests/fast/css/only-of-type-pseudo-class.html -crlf
+LayoutTests/fast/css/text-input-with-webkit-border-radius.html -crlf
+LayoutTests/fast/dom/Document/open-with-pending-load.html -crlf
+LayoutTests/fast/dom/Element/hostname-host.html -crlf
+LayoutTests/fast/dom/StyleSheet/ownerNode-lifetime-2.html -crlf
+LayoutTests/fast/dom/Window/window-property-clearing-expected.txt -crlf
+LayoutTests/fast/dom/everything-to-string.html -crlf
+LayoutTests/fast/dom/insert-span-into-long-text-bug-28245.html -crlf
+LayoutTests/fast/dom/resources/TestApplet.java -crlf
+LayoutTests/fast/dom/simultaneouslyRegsiteredTimerFireOrder-expected.txt -crlf
+LayoutTests/fast/dom/timer-clear-interval-in-handler-and-generate-error.html -crlf
+LayoutTests/fast/events/keydown-keypress-focus-change.html -crlf
+LayoutTests/fast/events/node-event-anchor-lock.html -crlf
+LayoutTests/fast/events/onload-fires-twice.html -crlf
+LayoutTests/fast/events/set-event-in-another-frame.html -crlf
+LayoutTests/fast/events/set-event-to-null.html -crlf
+LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-main.html -crlf
+LayoutTests/fast/forms/resources/form-and-frame-interaction-retains-values-submit.html -crlf
+LayoutTests/fast/forms/select-remove-option.html -crlf
+LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html -crlf
+LayoutTests/fast/forms/textfield-onchange-deletion.html -crlf
+LayoutTests/fast/frames/frame-src-attribute.html -crlf
+LayoutTests/fast/frames/iframe-scroll-page-up-down.html-disabled -crlf
+LayoutTests/fast/frames/javascript-url-as-framesrc-crash.html -crlf
+LayoutTests/fast/frames/resources/iframe-scroll-page-up-down-1.html -crlf
+LayoutTests/fast/frames/resources/iframe-scroll-page-up-down-2.html -crlf
+LayoutTests/fast/frames/viewsource-attribute.html -crlf
+LayoutTests/fast/inline/inline-padding-disables-text-quirk.html -crlf
+LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml -crlf
+LayoutTests/fast/overflow/dynamic-hidden.html -crlf
+LayoutTests/fast/parser/external-entities-in-xslt.xml -crlf
+LayoutTests/fast/parser/external-entities.xml -crlf
+LayoutTests/fast/parser/resources/external-entities.xsl -crlf
+LayoutTests/fast/replaced/replaced-breaking.html -crlf
+LayoutTests/fast/table/dynamic-cellpadding.html -crlf
+LayoutTests/fast/table/fixed-table-with-percent-inside-percent-table.html -crlf
+LayoutTests/fast/table/fixed-table-with-percent-width-inside-auto-table.html -crlf
+LayoutTests/fast/table/fixed-table-with-percent-width-inside-extra-large-div.html -crlf
+LayoutTests/fast/table/fixed-table-with-small-percent-width.html -crlf
+LayoutTests/fast/table/rules-attr-dynchange1.html -crlf
+LayoutTests/fast/table/rules-attr-dynchange2.html -crlf
+LayoutTests/fast/text/international/thai-baht-space.html -crlf
+LayoutTests/fast/text/resources/line-breaks-crlf.txt -crlf
+LayoutTests/fast/text/text-large-negative-letter-spacing-with-opacity.html -crlf
+LayoutTests/fast/text/text-letter-spacing.html -crlf
+LayoutTests/http/tests/appcache/max-size.html -crlf
+LayoutTests/http/tests/misc/location-test-xsl-style-sheet.xml -crlf
+LayoutTests/http/tests/misc/resources/location-test-xsl-style-sheet.xsl -crlf
+LayoutTests/http/tests/misc/single-character-pi-stylesheet.xhtml -crlf
+LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect.html -crlf
+LayoutTests/http/tests/navigation/no-referrer-reset.html -crlf
+LayoutTests/http/tests/navigation/no-referrer-same-window.html -crlf
+LayoutTests/http/tests/navigation/no-referrer-subframe.html -crlf
+LayoutTests/http/tests/navigation/no-referrer-target-blank.html -crlf
+LayoutTests/http/tests/navigation/resources/no-referrer-same-window-helper.php -crlf
+LayoutTests/http/tests/security/isolatedWorld/events.html -crlf
+LayoutTests/http/tests/security/isolatedWorld/resources/iframe.html -crlf
+LayoutTests/http/tests/security/isolatedWorld/resources/userGestureEvents-second-window.html -crlf
+LayoutTests/http/tests/security/isolatedWorld/userGestureEvents.html -crlf
+LayoutTests/http/tests/security/resources/empty-svg.php -crlf
+LayoutTests/platform/win/fast/events/panScroll-event-fired.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-image-no-scroll.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-imageMap-href-no-scroll.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-imageMap-noHref-scroll.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-nested-divs.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html -crlf
+LayoutTests/platform/win/fast/events/panScroll-preventDefault.html -crlf
+LayoutTests/svg/custom/marker-opacity.svg -crlf
+LayoutTests/svg/custom/resources/graffiti.svg -crlf
+LayoutTests/svg/custom/struct-use-09-b.svg -crlf
+LayoutTests/svg/custom/svg-fonts-in-html.html -crlf
+LayoutTests/svg/custom/use-events-crash.svg -crlf
+LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg -crlf
+LayoutTests/svg/custom/use-setAttribute-crash.svg -crlf
+LayoutTests/svg/custom/xml-stylesheet.svg -crlf
+LayoutTests/tables/mozilla/bugs/bug119786.html -crlf
+LayoutTests/tables/mozilla/bugs/bug222846.html -crlf
+LayoutTests/tables/mozilla/bugs/bug275625.html -crlf
+LayoutTests/tables/mozilla/images/aboutHeader.gif -crlf
+LayoutTests/tables/mozilla/images/main-horizontal-scroll.gif -crlf
+LayoutTests/tables/mozilla_expected_failures/bugs/bug101759.html -crlf
+LayoutTests/tables/mozilla_expected_failures/bugs/bug14489.html -crlf
+LayoutTests/tables/mozilla_expected_failures/images/aboutHeader.gif -crlf
+LayoutTests/tables/mozilla_expected_failures/images/main-horizontal-scroll.gif -crlf
+LayoutTests/wml/resources/enter-card-with-events.wml -crlf
+LayoutTests/wml/resources/enter-first-card-with-events.wml -crlf
+PageLoadTests/svg/files/Harvey_Rayner.svg -crlf
+PageLoadTests/svg/files/cacuts_01.svg -crlf
+PageLoadTests/svg/files/crawfish2_ganson.svg -crlf
+PageLoadTests/svg/files/france.svg -crlf
+PageLoadTests/svg/files/mtsthelens.svg -crlf
+PageLoadTests/svg/files/worldcup.svg -crlf
+PlanetWebKit/planet/LICENCE -crlf
+SunSpider/tests/parse-only/jquery-1.3.2.js -crlf
+WebCore/WebCore.vcproj/QTMovieWin.vcproj -crlf
+WebCore/WebCore.vcproj/WebCore.sln -crlf
+WebCore/WebCore.vcproj/WebCore.submit.sln -crlf
+WebCore/WebCore.vcproj/WebCore.vcproj -crlf
+WebCore/WebCore.vcproj/WebCoreCFNetwork.vsprops -crlf
+WebCore/WebCore.vcproj/WebCoreCG.vsprops -crlf
+WebCore/WebCore.vcproj/WebCoreCURL.vsprops -crlf
+WebCore/WebCore.vcproj/WebCoreCairo.vsprops -crlf
+WebCore/WebCore.vcproj/WebCoreGenerated.vcproj -crlf
+WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops -crlf
+WebCore/WebCore.vcproj/WebCorePthreads.vsprops -crlf
+WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops -crlf
+WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
+WebCore/bindings/js/JSExceptionBase.cpp -crlf
+WebCore/bindings/js/JSExceptionBase.h -crlf
+WebCore/manual-tests/DOMContextMenuEvent.html -crlf
+WebCore/manual-tests/cursor-max-size.html -crlf
+WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf
+WebCore/manual-tests/empty-script-crash.html -crlf
+WebCore/manual-tests/remove-form-node-with-radio-buttons-crash.html -crlf
+WebCore/manual-tests/select-delete-item.html -crlf
+WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html -crlf
+WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
+WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
+WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
+WebCore/rendering/RenderThemeChromiumWin.h -crlf
+WebCore/wml/WMLInputElement.cpp -crlf
+WebCore/wml/WMLInputElement.h -crlf
+WebKit/chromium/src/EventListenerWrapper.cpp -crlf
+WebKit/chromium/src/EventListenerWrapper.h -crlf
+WebKit/chromium/src/WebEventListener.cpp -crlf
+WebKit/chromium/src/WebEventListenerPrivate.cpp -crlf
+WebKit/chromium/src/WebEventListenerPrivate.h -crlf
+WebKit/gtk/po/sr.po -crlf
+WebKit/gtk/po/sr at latin.po -crlf
+WebKit/qt/tests/qwebframe/resources/testiframe.html -crlf
+WebKit/qt/tests/qwebframe/resources/testiframe2.html -crlf
+WebKit/win/COMPropertyBag.h -crlf
+WebKit/win/COMVariantSetter.h -crlf
+WebKit/win/Interfaces/IWebEmbeddedView.idl -crlf
+WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl -crlf
+WebKit/win/WebCoreSupport/EmbeddedWidget.cpp -crlf
+WebKit/win/WebCoreSupport/EmbeddedWidget.h -crlf
+WebKit/win/WebCoreSupport/WebInspectorDelegate.h -crlf
+WebKit/win/WebIconFetcher.cpp -crlf
+WebKit/win/WebIconFetcher.h -crlf
+WebKit/win/WebKit.vcproj/Interfaces.vcproj -crlf
+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
+WebKitLibraries/win/tools/vsprops/WinCairo.vsprops -crlf
+WebKitLibraries/win/tools/vsprops/cURL.vsprops -crlf
+WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops -crlf
+WebKitSite/blog/license.txt -crlf
+WebKitSite/blog/wp-config-sample.php -crlf
+WebKitSite/blog/wp-config.php -crlf
+WebKitSite/blog/wp-includes/images/crystal/license.txt -crlf
+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/CLWrapper/CLWrapper.sln -crlf
+WebKitTools/CLWrapper/CLWrapper.vcproj -crlf
+WebKitTools/DumpRenderTree/DumpRenderTree.sln -crlf
+WebKitTools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
+WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj -crlf
+WebKitTools/DumpRenderTree/win/ImageDiff.vcproj -crlf
+WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.def -crlf
+WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc -crlf
+WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj -crlf
+WebKitTools/FindSafari/FindSafari.vcproj -crlf
+WebKitTools/FindSafari/Safari.exe.manifest -crlf
+WebKitTools/MIDLWrapper/MIDLWrapper.sln -crlf
+WebKitTools/MIDLWrapper/MIDLWrapper.vcproj -crlf
+WebKitTools/Scripts/webkitpy/mock.py -crlf
+WebKitTools/WebKitAPITest/WebKitAPITest.vcproj -crlf
+WebKitTools/WebKitAPITest/WebKitAPITestCommon.vsprops -crlf
+WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj -crlf
+WebKitTools/WinLauncher/WinLauncher.h -crlf
+WebKitTools/WinLauncher/WinLauncher.vcproj -crlf
+WebKitTools/record-memory-win/main.cpp -crlf
+WebKitTools/record-memory-win/record-memory-win.vcproj -crlf
diff --git a/ChangeLog b/ChangeLog
index 998e193..584feef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-05  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Add .gitattributes file to tell git about files with Windows linefeeds
+        https://bugs.webkit.org/show_bug.cgi?id=34645
+
+        On Windows git defaults to "true" for core.autocrlf, meaning all text
+        files in the working directory are converted from CRLF to LF on checkin
+        time. Some files present in the repository have been checked in with
+        CRLF linefeeds and git should not try to convert them. The added
+        .gitattributes file tells git to not do any CRLF conversion.
+
+        * .gitattributes: Added.
+
 2010-02-05  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list