Merge remote-tracking branch 'origin/master' into develop

.gitattributes

@@ -2,69 +2,70 @@
 * text=auto
 
 # sources
-*.c text
+*.c      text eol=lf
-*.cc text
+*.cc     text eol=lf
-*.cxx text
+*.cxx    text eol=lf
-*.cpp text
+*.cpp    text eol=lf
-*.c++ text
+*.c++    text eol=lf
-*.hpp text
+*.hpp    text eol=lf
-*.h text
+*.h      text eol=lf
-*.h++ text
+*.h++    text eol=lf
-*.hh text
+*.hh     text eol=lf
-*.bat    text
+*.bat    text eol=crlf
-*.coffee text
+*.cmd    text eol=crlf
-*.css    text
+*.coffee text eol=lf
-*.htm    text
+*.css    text eol=lf
-*.html   text
+*.htm    text eol=lf
-*.inc    text
+*.html   text eol=lf
-*.ini    text
+*.inc    text eol=lf
-*.js     text
+*.ini    text eol=crlf
-*.jsx    text
+*.js     text eol=lf
-*.json   text
+*.jsx    text eol=lf
-*.less   text
+*.json   text eol=lf
-*.php    text
+*.less   text eol=lf
-*.pl     text
+*.php    text eol=lf
-*.py     text
+*.pl     text eol=lf
-*.rb     text
+*.py     text eol=lf
-*.sass   text
+*.rb     text eol=lf
-*.scm    text
+*.sass   text eol=lf
-*.scss   text
+*.scm    text eol=lf
-*.sh     text
+*.scss   text eol=lf
-*.sql    text
+*.sh     text eol=lf
-*.styl   text
+*.sql    text eol=lf
-*.ts     text
+*.styl   text eol=lf
-*.xml    text
+*.ts     text eol=lf
-*.xhtml  text
+*.xml    text eol=lf
+*.xhtml  text eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 Makefile eol=lf
-*.mk eol=lf
+*.mk     eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 *.sh eol=lf
 
 # documentation
-*.markdown   text
+*.markdown   text eol=lf
-*.md         text
+*.md         text eol=lf
-*.mdwn       text
+*.mdwn       text eol=lf
-*.mdown      text
+*.mdown      text eol=lf
-*.mkd        text
+*.mkd        text eol=lf
-*.mkdn       text
+*.mkdn       text eol=lf
-*.mdtxt      text
+*.mdtxt      text eol=lf
-*.mdtext     text
+*.mdtext     text eol=lf
-*.txt        text
+*.txt        text eol=lf
-AUTHORS      text
+AUTHORS      text eol=lf
-CHANGELOG    text
+CHANGELOG    text eol=lf
-CHANGES      text
+CHANGES      text eol=lf
-CONTRIBUTING text
+CONTRIBUTING text eol=lf
-COPYING      text
+COPYING      text eol=lf
-INSTALL      text
+INSTALL      text eol=lf
-license      text
+license      text eol=lf
-LICENSE      text
+LICENSE      text eol=lf
-NEWS         text
+NEWS         text eol=lf
-readme       text
+readme       text eol=lf
-*README*     text
+*README*     text eol=lf
-TODO         text
+TODO         text eol=lf
 
 GRAPHICS
 *.ai   binary
@@ -82,7 +83,7 @@ GRAPHICS
 *.png  binary
 *.psb  binary
 *.psd  binary
-*.svg  text
+*.svg  text eol=lf
 *.svgz binary
 *.tif  binary
 *.tiff binary