diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2018-12-30 11:04:10 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2018-12-30 11:04:10 +0100 |
| commit | 362f9350868286b066070df7da1f496df08ecd73 (patch) | |
| tree | d4bf7e564018d835092fff0f311ebcec6740d02d /.gitattributes | |
| parent | 26bb0e5a831be64f21eec41efef73571aebadab5 (diff) | |
| parent | de199c327e9b55bd615f7262724da8ecba1999cf (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 86b72ea30..c706bfbe8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,13 +20,15 @@ makesrcdist export-ignore eol=lf # fluid files (eol=lf or text?) -#*FIXME* *.fl eol=lf +*.fl eol=lf # shell scripts etc. with Unix line endings (lf) *.ac eol=lf +*.in eol=lf *.desktop eol=lf *.sh eol=lf + fltk-config.in eol=lf documentation/make_pdf eol=lf @@ -36,9 +38,10 @@ misc/update_config_scripts eol=lf # files with Windows line endings (crlf) -#*FIXME* *.rc eol=crlf +*.rc eol=crlf -#*FIXME* ide/AndroidStudio3/gradlew.rename_to_bat eol=crlf +# Android Studio special support file (Windows .bat file) +ide/AndroidStudio3/gradlew.rename_to_bat eol=crlf # binary files |