summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
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