Merge branch 'rc/maint-http-local-slot-fix' into maint

diff --git a/.gitattributes b/.gitattributes
index f96112d47f743289bf3893981bc89dcaa9caae19..0636deea9357d2f1e9331119f02fb75fb6b15393 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
-*           encoding=US-ASCII
-git-gui.sh  encoding=UTF-8
-/po/*.po    encoding=UTF-8
+* whitespace=!indent,trail,space
+*.[ch] whitespace=indent,trail,space