2011-03-30 Mihai Parparita <mihaip@chromium.org>
[WebKit-https.git] / .gitattributes
index 46ca454..8117d8a 100644 (file)
@@ -1,15 +1,24 @@
-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
+# To enable automatic merging of ChangeLog files, use the following command:
+# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
+ChangeLog* merge=changelog
+
+# To enable smart diffing of ObjC[++] files, run the following commands:
+# git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
+# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
+*.m diff=objc
+*.mm diff=objcpp
+mac/*.h diff=objcppheader
+*/mac/*.h diff=objcppheader
+*/*/mac/*.h diff=objcppheader
+objc/*.h diff=objcppheader
+*/objc/*.h diff=objcppheader
+*/*/objc/*.h diff=objcppheader
+Tools/WebKitLauncher/*.h diff=objcppheader
+
+*.vcproj eol=crlf
+*.vsprops eol=crlf
+*.sln eol=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
@@ -178,40 +187,34 @@ 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
+PerformanceTests/PageLoad/svg/files/Harvey_Rayner.svg -crlf
+PerformanceTests/PageLoad/svg/files/cacuts_02.svg -crlf
+PerformanceTests/PageLoad/svg/files/crawfish2_ganson.svg -crlf
+PerformanceTests/PageLoad/svg/files/france.svg -crlf
+PerformanceTests/PageLoad/svg/files/mtsthelens.svg -crlf
+PerformanceTests/PageLoad/svg/files/worldcup.svg -crlf
+PerformanceTests/SunSpider/tests/parse-only/jquery-1.3.2.js -crlf
+Source/WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
+Source/WebCore/bindings/js/JSExceptionBase.cpp -crlf
+Source/WebCore/bindings/js/JSExceptionBase.h -crlf
+Source/WebCore/manual-tests/DOMContextMenuEvent.html -crlf
+Source/WebCore/manual-tests/cursor-max-size.html -crlf
+Source/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf
+Source/WebCore/manual-tests/empty-script-crash.html -crlf
+Source/WebCore/manual-tests/remove-form-node-with-radio-buttons-crash.html -crlf
+Source/WebCore/manual-tests/select-delete-item.html -crlf
+Source/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html -crlf
+Source/WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
+Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
+Source/WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
+Source/WebCore/rendering/RenderThemeChromiumWin.h -crlf
+Tools/BuildSlaveSupport/win/kill-old-processes -crlf
+Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
+Tools/FindSafari/Safari.exe.manifest -crlf
+Tools/MiniBrowser/win/MiniBrowser.rc -crlf
+Tools/TestResultServer/index.yaml -crlf
+Tools/WinLauncher/WinLauncher.h -crlf
+Tools/record-memory-win/main.cpp -crlf
 WebKit/chromium/src/EventListenerWrapper.cpp -crlf
 WebKit/chromium/src/EventListenerWrapper.h -crlf
 WebKit/chromium/src/WebEventListener.cpp -crlf
@@ -230,40 +233,12 @@ 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
+Websites/planet.webkit.org/planet/LICENCE -crlf
+Websites/webkit.org/blog/license.txt -crlf
+Websites/webkit.org/blog/wp-config-sample.php -crlf
+Websites/webkit.org/blog/wp-config.php -crlf
+Websites/webkit.org/blog/wp-includes/images/crystal/license.txt -crlf
+Websites/webkit.org/blog/wp-includes/js/scriptaculous/MIT-LICENSE -crlf
+Websites/webkit.org/blog/wp-includes/js/swfupload/plugins/swfupload.speed.js -crlf
+Websites/webkit.org/blog/wp-includes/js/tinymce/license.txt -crlf
+Websites/webkit.org/perf/slickspeed/frameworks/DomQuery.js -crlf