Commit 1d71c502 authored by Brad King's avatar Brad King

Merge branch 'upstream-GitSetup' into developer-setup

* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
parents 6f0ac1e4 868c1e68
.git* export-ignore
.gitattributes -export-ignore
config* eol=lf whitespace=indent-with-non-tab
git-* eol=lf whitespace=indent-with-non-tab
tips eol=lf whitespace=indent-with-non-tab
setup-* eol=lf whitespace=indent-with-non-tab
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