From 385e7a6a91091a4f59fec3b986a1db826c5b8933 Mon Sep 17 00:00:00 2001
From: Matt Campbell <mattcampbell@pobox.com>
Date: Tue, 28 Oct 2014 13:33:47 -0500
Subject: [PATCH] Treat UTF-16 files in src/Setup as binary

---
 .gitattributes | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 7acbd16c3..b9faf9092 100644
--- 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 
\ No newline at end of file
+*.sln text eol=crlf merge=union 
+
+src/Setup/resource.h binary
+src/Setup/Setup.rc binary