haikuwebkit/.gitattributes

32 lines
1.1 KiB
Plaintext
Raw Permalink Normal View History

# 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
# To enable smart diffing of *.strings files, run the following command:
# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
*.strings diff=localizablestrings
.: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * .gitattributes: ANGLE: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * src/libEGL/libEGL.vcproj: Added property svn:eol-style. * src/libGLESv2/libGLESv2.vcproj: Added property svn:eol-style. JavaScriptCore: 010-12-01 Steve Falkenburg <sfalken@apple.com> Reviewed by Adam Roben. vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 * JavaScriptCore.vcproj/JavaScriptCore.sln: Modified property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Modified property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: Modified property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln: Modified property svn:eol-style. * JavaScriptCore.vcproj/WTF/WTF.vcproj: Modified property svn:eol-style. * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/jsc/jsc.vcproj: Modified property svn:eol-style. * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Added property svn:eol-style. * JavaScriptCore.vcproj/testapi/testapi.vcproj: Modified property svn:eol-style. * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: Added property svn:eol-style. WebCore: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * WebCore.vcproj/QTMovieWin.vcproj: Modified property svn:eol-style. * WebCore.vcproj/QTMovieWinCommon.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCore.sln: Modified property svn:eol-style. * WebCore.vcproj/WebCore.submit.sln: Modified property svn:eol-style. * WebCore.vcproj/WebCore.vcproj: Modified property svn:eol-style. * WebCore.vcproj/WebCoreCFNetwork.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreCG.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreCURL.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreCairo.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreCommon.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreGenerated.vcproj: Modified property svn:eol-style. * WebCore.vcproj/WebCoreGeneratedCairo.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreGeneratedCommon.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreMediaQT.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCorePthreads.vsprops: Added property svn:eol-style. * WebCore.vcproj/WebCoreQuartzCore.vsprops: Added property svn:eol-style. WebKit/win: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * WebKit.vcproj/Interfaces.vcproj: Modified property svn:eol-style. * WebKit.vcproj/InterfacesCommon.vsprops: Added property svn:eol-style. * WebKit.vcproj/WebKit.sln: Modified property svn:eol-style. * WebKit.vcproj/WebKit.submit.sln: Modified property svn:eol-style. * WebKit.vcproj/WebKit.vcproj: Modified property svn:eol-style. * WebKit.vcproj/WebKitGUID.vcproj: Modified property svn:eol-style. * WebKit.vcproj/WebKitGUIDCommon.vsprops: Added property svn:eol-style. * WebKit.vcproj/WebKitLibCommon.vsprops: Added property svn:eol-style. WebKit2: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * win/WebKit2.submit.sln: Added property svn:eol-style. * win/WebKit2.vcproj: Added property svn:eol-style. * win/WebKit2Apple.vsprops: Added property svn:eol-style. * win/WebKit2CFLite.vsprops: Added property svn:eol-style. * win/WebKit2Common.vsprops: Added property svn:eol-style. * win/WebKit2DirectX.vsprops: Added property svn:eol-style. * win/WebKit2Generated.vcproj: Added property svn:eol-style. * win/WebKit2GeneratedCommon.vsprops: Added property svn:eol-style. * win/WebKit2WebProcess.vcproj: Added property svn:eol-style. * win/WebKit2WebProcessCommon.vsprops: Added property svn:eol-style. WebKitLibraries: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * win/tools/vsprops/WinCairo.vsprops: Added property svn:eol-style. * win/tools/vsprops/cURL.vsprops: Added property svn:eol-style. * win/tools/vsprops/debug_wincairo.vsprops: Added property svn:eol-style. WebKitTools: vcproj changes can't be applied cleanly by the Windows EWS bot https://bugs.webkit.org/show_bug.cgi?id=50328 Reviewed by Adam Roben. * CLWrapper/CLWrapper.sln: Modified property svn:eol-style. * CLWrapper/CLWrapper.vcproj: Modified property svn:eol-style. * DumpRenderTree/DumpRenderTree.sln: Modified property svn:eol-style. * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginCommon.vsprops: Added property svn:eol-style. * DumpRenderTree/win/DumpRenderTree.vcproj: Modified property svn:eol-style. * DumpRenderTree/win/DumpRenderTreeApple.vsprops: Added property svn:eol-style. * DumpRenderTree/win/DumpRenderTreeCFLite.vsprops: Added property svn:eol-style. * DumpRenderTree/win/DumpRenderTreeCairo.vsprops: Added property svn:eol-style. * DumpRenderTree/win/DumpRenderTreeCommon.vsprops: Added property svn:eol-style. * DumpRenderTree/win/ImageDiff.vcproj: Modified property svn:eol-style. * DumpRenderTree/win/ImageDiffCommon.vsprops: Added property svn:eol-style. * FindSafari/FindSafari.vcproj: Modified property svn:eol-style. * FindSafari/FindSafariCommon.vsprops: Added property svn:eol-style. * MIDLWrapper/MIDLWrapper.sln: Modified property svn:eol-style. * MIDLWrapper/MIDLWrapper.vcproj: Modified property svn:eol-style. * MiniBrowser/Configurations/MiniBrowserCFLite.vsprops: Added property svn:eol-style. * MiniBrowser/Configurations/MiniBrowserCommon.vsprops: Added property svn:eol-style. * MiniBrowser/Configurations/MiniBrowserCoreFoundation.vsprops: Added property svn:eol-style. * MiniBrowser/MiniBrowser.vcproj: Added property svn:eol-style. * TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops: Added property svn:eol-style. * TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops: Added property svn:eol-style. * TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops: Added property svn:eol-style. * TestWebKitAPI/win/TestWebKitAPI.sln: Added property svn:eol-style. * TestWebKitAPI/win/TestWebKitAPI.vcproj: Added property svn:eol-style. * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj: Added property svn:eol-style. * TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops: Added property svn:eol-style. * WebKitAPITest/WebKitAPITest.vcproj: Added property svn:eol-style. * WebKitAPITest/WebKitAPITestCommon.vsprops: Added property svn:eol-style. * WebKitLauncherWin/WebKitLauncherWin.vcproj: Modified property svn:eol-style. * WebKitLauncherWin/WebKitLauncherWinCommon.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops: Added property svn:eol-style. * WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops: Added property svn:eol-style. * WebKitTestRunner/WebKitTestRunner.sln: Added property svn:eol-style. * WebKitTestRunner/win/InjectedBundle.vcproj: Added property svn:eol-style. * WebKitTestRunner/win/InjectedBundleGenerated.vcproj: Added property svn:eol-style. * WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops: Added property svn:eol-style. * WebKitTestRunner/win/WebKitTestRunner.vcproj: Added property svn:eol-style. * WinLauncher/WinLauncher.vcproj: Modified property svn:eol-style. * WinLauncher/WinLauncherCommon.vsprops: Added property svn:eol-style. * record-memory-win/record-memory-win-common.vsprops: Added property svn:eol-style. * record-memory-win/record-memory-win.vcproj: Modified property svn:eol-style. Canonical link: https://commits.webkit.org/63507@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@73060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2010-12-01 21:01:27 +00:00
*.vcproj eol=crlf
*.vsprops eol=crlf
*.sln eol=crlf
# For best performance, place rules for deep paths in the parent directory.
# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
# Exclude these git specific files from archives created via git-archive.
.gitignore export-ignore
.gitattributes export-ignore