summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2018-12-20 18:56:16 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2018-12-20 19:42:17 +0100
commit2153a93430d59e64eac654ac44e05e51fdd98045 (patch)
tree8c65214a4ef8fce67c35785cf5f0ad1b31595030 /.gitattributes
parent88129db051f0af336e15f4d02748c74c59cd3c06 (diff)
Fix line endings.
Note: we recommend `git config core.autocrlf true'.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes9
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