diff options
| author | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
| commit | 6fa16209519896de09949a27425dff00ebf2970a (patch) | |
| tree | f00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /.gitattributes | |
| parent | 401ae1bb353887a2b90a3dbf53b8913dc84d70a9 (diff) | |
| parent | af48e774189596b8d7a058c564a7d6d75205ca03 (diff) | |
| download | shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.gz shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.bz2 shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bdb0cab --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain |