Merge ".gitattributes: force mkv/webm to be treated as binary"
diff --git a/.gitattributes b/.gitattributes
index 6394064..2b5cda5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,5 @@
 *.vcproj        eol=crlf
 *.vsprops       eol=crlf
 *.vcxproj       eol=crlf
+*.mkv           -text -diff
+*.webm          -text -diff