Update Git line ending settings

Copied from MMF2Exts repo.

Author: SortaCore

.editorconfig

@@ -1,6 +1,7 @@
 root = true
+# Don't forget to update the gitattributes if you're changing line ending treatment
 
-[*.{c,cc,cpp,h,hh,hpp}]
+[*.{c,cc,cpp,h,hh,hpp,txt,props}]
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
@@ -15,3 +16,19 @@ charset = utf-8
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = false
+
+[*.{json}]
+end_of_line = lf
+insert_final_newline = true
+charset = latin1
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{rc,htm,html}]
+end_of_line = crlf
+insert_final_newline = true
+charset = latin1
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true

.gitattributes

@@ -1,9 +1,19 @@
-*.c text=auto eol=lf
-*.cc text=auto eol=lf
-*.cpp text=auto eol=lf
-*.cxx text=auto eol=lf
-*.h text=auto eol=lf
-*.hh text=auto eol=lf
-*.hpp text=auto eol=lf
-*.hxx text=auto eol=lf
-*.md text=auto eol=lf
+# From the editorconfig
+*.c text eol=lf
+*.cc text eol=lf
+*.cpp text eol=lf
+*.cxx text eol=lf
+*.h text eol=lf
+*.hh text eol=lf
+*.hpp text eol=lf
+*.hxx text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.rc text eol=crlf
+*.htm text eol=crlf
+*.html text eol=crlf
+
+*.vcxproj text=auto merge=union
+*.sln text=auto eol=crlf merge=union