diff --git a/.gitattributes b/.gitattributes index 3e5b64f..6755504 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,11 @@ -*.h eol=lf -*.hpp eol=lf -*.c eol=lf -*.cpp eol=lf -.git* eol=lf +# Line endings are the repository's, not the editing machine's: this checkout +# is reached from two hosts, and a file rewritten by a Windows tool comes back +# with every line changed unless something says otherwise. Naming the source +# extensions left Markdown, Python, shell and CMake to whatever the writing +# tool defaulted to, which is CRLF on one of the two. +* text=auto eol=lf + +# Atmel Studio writes these and expects them back. *.vcxproj* eol=crlf *.cppproj eol=crlf *.sln eol=crlf diff --git a/libavr b/libavr index 00d669b..4cc850f 160000 --- a/libavr +++ b/libavr @@ -1 +1 @@ -Subproject commit 00d669b4510579d202bac059f46246448d5cac3b +Subproject commit 4cc850f200df6bfc2f5c9448b85860d79987e1d9