From bafadd544eee609a3a467ba0e79764c7492b3ed7 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Tue, 10 Dec 2019 22:13:05 +0100
Subject: [PATCH] Material: add gitattributes file to let git manage file
 endings and normalize them

---
 src/Mod/Material/.gitattributes         | 51 +++++++++++++++++++++++++
 src/Mod/Material/Resources/Material.qrc | 12 +++---
 2 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 src/Mod/Material/.gitattributes

diff --git a/src/Mod/Material/.gitattributes b/src/Mod/Material/.gitattributes
new file mode 100644
index 000000000000..9c6585a46b94
--- /dev/null
+++ b/src/Mod/Material/.gitattributes
@@ -0,0 +1,51 @@
+# In case people don't have core.autocrlf set, this will manage the default line-ending
+# behaviour for all files recursively
+# * text=auto
+# to be save this will be commented
+
+
+# for more information see forum topic and pull request
+# https://github.com/FreeCAD/FreeCAD/pull/2752
+# https://forum.freecadweb.org/viewtopic.php?f=17&t=41117
+
+
+# get all used file types
+# in a directory in a bash use
+# find . -type f -name '*.*' | sed 's|.*\.||' | sort -u
+# add all of them either to text or binary
+
+
+# Explicitly declare which files we wish to always normalize line-endings on
+
+# standard endings
+*.csv text
+*.py text
+*.qrc text
+*.sh text
+*.ts text
+*.txt text
+*.ui text
+*.yml text
+
+
+# These files will always be checked out with CRLF, i.e. windows-style line endings. This
+# really should not be needed...
+# *.SomeWindowsFileExtensionThatReallyRequiresCRLFEvenInLinux eol=crlf
+
+
+# These files should be ignored as it pertains to line-endings, because they are binary.
+# Since auto normalize is deactivated all these could be commented too.
+# *.dox binary
+# *.jpg binary
+# *.png binary
+# *.pyc binary
+# *.qm binary
+# *.svg binary
+
+# Material specific endings
+# *.FCMat binary
+# *.ods binary
+
+
+# use git to manually correct the file endings
+# git add --renormalize .
diff --git a/src/Mod/Material/Resources/Material.qrc b/src/Mod/Material/Resources/Material.qrc
index 1a16c8c38e94..06a6a58d8f1a 100644
--- a/src/Mod/Material/Resources/Material.qrc
+++ b/src/Mod/Material/Resources/Material.qrc
@@ -1,6 +1,6 @@
-<RCC>
-    <qresource> 
-        <file>icons/preview-rendered.svg</file>
-        <file>icons/preview-vector.svg</file>
-    </qresource>
-</RCC> 
+<RCC>
+    <qresource> 
+        <file>icons/preview-rendered.svg</file>
+        <file>icons/preview-vector.svg</file>
+    </qresource>
+</RCC>