summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-02-02 12:27:02 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-02-02 12:27:02 +0000
commit9dc26d065b7de0d25addc9a9198dff826ec09078 (patch)
treeb46c2c779a9f6ddef4bc00f7424f2c95bcd9d518
parent8de41333fbf443f6dace27dbd0b1d74a4df3f5ef (diff)
downloadtotem-9dc26d065b7de0d25addc9a9198dff826ec09078.tar.gz
Add video/x-matroska and audio/x-matroska as supported mime-types
2007-02-02 Bastien Nocera <hadess@hadess.net> * data/mime-type-list.txt: Add video/x-matroska and audio/x-matroska as supported mime-types svn path=/branches/gnome-2-16/; revision=3990
-rw-r--r--ChangeLog5
-rw-r--r--data/mime-type-list.txt2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 21ffb8fcd..75ad5fa13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-02-02 Bastien Nocera <hadess@hadess.net>
+ * data/mime-type-list.txt: Add video/x-matroska and audio/x-matroska
+ as supported mime-types
+
+2007-02-02 Bastien Nocera <hadess@hadess.net>
+
* data/mime-type-list.txt:
* src/plparse/totem-pl-parser.c: Add support for application/ram
diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
index d82b72e36..3bac25490 100644
--- a/data/mime-type-list.txt
+++ b/data/mime-type-list.txt
@@ -34,6 +34,8 @@ audio/3gpp
application/ogg
application/x-ogg
application/x-matroska
+audio/x-matroska
+video/x-matroska
audio/x-mp3
audio/x-mpeg
audio/mpeg