commit files with wrong line endings

Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b'
Squashed 'lib/lufa/' changes from a44056fb9..f2bd51f4e
2017-07-08 12:34:36 -07:00 · 2017-07-07 21:46:08 -04:00 · 2017-07-07 21:46:04 -04:00 · 2017-07-07 16:40:03 -04:00 · 2017-07-07 16:40:01 -04:00 · 2017-07-07 13:28:31 -07:00
2 changed files with 98 additions and 0 deletions
@@ -44,6 +44,8 @@ Shortcuts for bootmagic options (these work even when bootmagic is off.)
 |`MAGIC_UNSWAP_ALT_GUI`/`AG_NORM`|Disable the Alt/GUI switching|
 |`MAGIC_TOGGLE_NKRO`|Turn NKRO on or off|
 <!-- FIXME: this formatting needs work
 ## Audio
 ```c
@@ -157,6 +159,8 @@ MI_MODSD, // decrease modulation speed
 MI_MODSU, // increase modulation speed
 #endif // MIDI_ADVANCED
 -->
 ## Backlight
 These keycodes control the backlight. Most keyboards use this for single color in-switch lighting.
@@ -0,0 +1,94 @@
 # auto for anything unspecified
 * text=auto
 # sources
 *.c text
 *.cc text
 *.cxx text
 *.cpp text
 *.c++ text
 *.hpp text
 *.h text
 *.h++ text
 *.hh text
 *.bat    text
 *.coffee text
 *.css    text
 *.htm    text
 *.html   text
 *.inc    text
 *.ini    text
 *.js     text
 *.jsx    text
 *.json   text
 *.less   text
 *.php    text
 *.pl     text
 *.py     text
 *.rb     text
 *.sass   text
 *.scm    text
 *.scss   text
 *.sh     text
 *.sql    text
 *.styl   text
 *.ts     text
 *.xml    text
 *.xhtml  text
 # make files (need to always use lf for compatibility with Windows 10 bash)
 Makefile eol=lf
 *.mk eol=lf
 # make files (need to always use lf for compatibility with Windows 10 bash)
 *.sh eol=lf
 # documentation
 *.markdown   text
 *.md         text
 *.mdwn       text
 *.mdown      text
 *.mkd        text
 *.mkdn       text
 *.mdtxt      text
 *.mdtext     text
 *.txt        text
 AUTHORS      text
 CHANGELOG    text
 CHANGES      text
 CONTRIBUTING text
 COPYING      text
 INSTALL      text
 license      text
 LICENSE      text
 NEWS         text
 readme       text
 *README*     text
 TODO         text
 GRAPHICS
 *.ai   binary
 *.bmp  binary
 *.eps  binary
 *.gif  binary
 *.ico  binary
 *.jng  binary
 *.jp2  binary
 *.jpg  binary
 *.jpeg binary
 *.jpx  binary
 *.jxr  binary
 *.pdf  binary
 *.png  binary
 *.psb  binary
 *.psd  binary
 *.svg  text
 *.svgz binary
 *.tif  binary
 *.tiff binary
 *.wbmp binary
 *.webp binary
 # hex files
 *.hex binary
 *.eep binary
Author	SHA1	Message	Date
skullY	6e2cae4cda	commit files with wrong line endings	2017-07-08 12:34:36 -07:00
Jack Humbert	03706de946	Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b'	2017-07-07 21:46:08 -04:00
Jack Humbert	5a3397d17e	Squashed 'lib/lufa/' changes from a44056fb9..f2bd51f4e f2bd51f4e fixing line endings git-subtree-dir: lib/lufa git-subtree-split: f2bd51f4edba87a259808c92c0424dc36475282b	2017-07-07 21:46:04 -04:00
Jack Humbert	ea3df7466a	Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61'	2017-07-07 16:40:03 -04:00
Jack Humbert	cedfbfcb1a	Squashed 'lib/lufa/' changes from 385d40300..a44056fb9 a44056fb9 add .gitattributes git-subtree-dir: lib/lufa git-subtree-split: a44056fb9d4784e3a248f460688b35977592cb05	2017-07-07 16:40:01 -04:00
skullY	03eb6a3e86	comment out unformatted audio/midi sections	2017-07-07 13:28:31 -07:00