summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2015-06-21 12:15:10 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2015-06-21 12:15:10 +0000
commit21b29d8136604b9cb75567326275572803aec0f2 (patch)
tree0e6f5e8c87a00c261bf4545ec4312c0a5640414b
parent9ec8613c01f9f2f3e008d4ee8df9267885632287 (diff)
Add .mkv (video/x-matroska).
From David Hill ok halex@
-rw-r--r--share/misc/mime.types3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/misc/mime.types b/share/misc/mime.types
index d3b9940542a..5968eb99952 100644
--- a/share/misc/mime.types
+++ b/share/misc/mime.types
@@ -1,4 +1,4 @@
-# $OpenBSD: mime.types,v 1.2 2014/08/29 08:06:30 reyk Exp $
+# $OpenBSD: mime.types,v 1.3 2015/06/21 12:15:09 reyk Exp $
application/atom+xml atom
application/font-woff woff
@@ -94,6 +94,7 @@ video/quicktime mov
video/webm webm
video/x-flv flv
video/x-m4v m4v
+video/x-matroska mkv
video/x-mng mng
video/x-ms-asf asx asf
video/x-ms-wmv wmv