diff options
author | Jeffrey Stedfast <jeff@xamarin.com> | 2015-03-14 09:21:16 -0400 |
---|---|---|
committer | Jeffrey Stedfast <jeff@xamarin.com> | 2015-03-14 09:21:16 -0400 |
commit | 5f446e15a61331939d37d0a62c72384e19b8a806 (patch) | |
tree | 6685f0f70604121f59b258d62e3efa63256053a6 /.gitattributes | |
parent | Merge branch 'master' into vs2010 (diff) | |
parent | Update TLS for draft-ietf-tls-session-hash-04 (diff) | |
download | BouncyCastle.NET-ed25519-5f446e15a61331939d37d0a62c72384e19b8a806.tar.xz |
Merge branch 'master' into vs2010
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 31e8a5ac4..edfb7e9ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,7 +13,8 @@ *.nunit text diff=xml *.pem text *.README text -*.sln text eol=crlf +*.sln text +*.tmpl text *.txt text *.xml text diff=xml @@ -23,6 +24,7 @@ *.crl binary *.crt binary *.data binary +*.dll binary *.dsa binary *.jpg binary *.jpeg binary |