Rename ENABLE_SUBTLE_CRYPTO to ENABLE_WEB_CRYPTO
[WebKit-https.git] / .gitattributes
index 78cad16..741c4d5 100644 (file)
@@ -14,6 +14,10 @@ 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 eol=crlf
 *.vsprops eol=crlf
 *.sln eol=crlf
@@ -22,21 +26,6 @@ objc/*.h diff=objcppheader
 # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
 # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
 
-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@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
+# Exclude these git specific files from archives created via git-archive.
+.gitignore      export-ignore
+.gitattributes  export-ignore