aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xdata/mime-types-permissions.xml2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d9635b261..b33234a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-01 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/mime-types-permissions.xml:
+
+ Add flv mime types. Bug #381099.
+
2006-11-17 Benjamin Berg <benjamin@sipsolutions.net>
* lib/widgets/ephy-spinner.c: (ephy_spinner_start):
diff --git a/data/mime-types-permissions.xml b/data/mime-types-permissions.xml
index 53dc227a6..b6c945321 100755
--- a/data/mime-types-permissions.xml
+++ b/data/mime-types-permissions.xml
@@ -383,6 +383,7 @@
<mime-type type="text/x-xslt"/>
<mime-type type="text/xmcd"/>
<mime-type type="text/xml"/>
+<mime-type type="video/flv"/>
<mime-type type="video/isivideo"/>
<mime-type type="video/mp4"/>
<mime-type type="video/mpeg"/>
@@ -392,6 +393,7 @@
<mime-type type="video/x-anim"/>
<mime-type type="video/x-avi"/>
<mime-type type="video/x-flic"/>
+<mime-type type="video/x-flv"/>
<mime-type type="video/x-m4v"/>
<mime-type type="video/x-mng"/>
<mime-type type="video/x-ms-asf"/>