Commit 64982b7b authored by Brad King's avatar Brad King
Browse files

Merge branch 'release' into disable-trailing-whitespace-check

Conflicts:
	.gitattributes
parents 17fc3b26 ee8cc207
......@@ -5,12 +5,12 @@ newalpha crlf=input
newversion crlf=input
pre-commit crlf=input
*.c whitespace=tab-in-indent
*.h whitespace=tab-in-indent
*.cxx whitespace=tab-in-indent
*.hxx whitespace=tab-in-indent
*.txx whitespace=tab-in-indent
*.txt whitespace=tab-in-indent
*.cmake whitespace=tab-in-indent
*.c whitespace=tab-in-indent,-blank-at-eol
*.h whitespace=tab-in-indent,-blank-at-eol
*.cxx whitespace=tab-in-indent,-blank-at-eol
*.hxx whitespace=tab-in-indent,-blank-at-eol
*.txx whitespace=tab-in-indent,-blank-at-eol
*.txt whitespace=tab-in-indent,-blank-at-eol
*.cmake whitespace=tab-in-indent,-blank-at-eol
/Utilities/vtksqlite/vtk_sqlite3.c hooks.MaxObjectKiB=4096
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment