Treat UTF-16 files in src/Setup as binary

djanknecht · Oct 28, 2014 · 385e7a6 · 385e7a6
1 parent ebc56c9
commit 385e7a6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -46,4 +46,7 @@
 *.vbproj text merge=union 
 *.fsproj text merge=union 
 *.dbproj text merge=union 
-*.sln text eol=crlf merge=union 
+*.sln text eol=crlf merge=union 
+
+src/Setup/resource.h binary
+src/Setup/Setup.rc binary