diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 14:52:18 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-27 14:52:18 -0400 |
| commit | d311fd8d1a0af3b767d26b520d399bf0db22f058 (patch) | |
| tree | b9de5704143ac205b4e26222f9d7551e9b161924 /tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes | |
| parent | a766918d5c48204375f4c207b30bbbf1389df14f (diff) | |
| parent | 6f3141965e88c4ee0ebf7c18a243e4c2d9c5021b (diff) | |
Merge pull request #34 from jackhumbert/tmk-master
merging from tmk, new_project script and template
Diffstat (limited to 'tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes')
| -rw-r--r-- | tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes new file mode 100644 index 0000000000..6238b035a3 --- /dev/null +++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/.gitattributes @@ -0,0 +1,23 @@ +# Auto detect text files and perform LF normalization +* text=auto +* text eol=lf + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# 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 |