Merge "CologneBlue rewrite: kill mWatchLinkNum, watchThisPage() is only called once...

[lhc/web/wiklou.git] / includes / mime.info

diff --git a/includes/mime.info b/includes/mime.info
index 9b05f08..f7576e4 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -1,41 +1,51 @@
-#Mime type info file.
-#the first mime type in each line is the "main" mime type,
-#the others are aliases for this type
-#the media type is given in upper case and square brackets, 
-#like [BITMAP], and must indicate a media type as defined by
-#the MEDIATYPE_xxx constants in Defines.php
+# Mime type info file.
+# the first mime type in each line is the "main" mime type,
+# the others are aliases for this type
+# the media type is given in upper case and square brackets,
+# like [BITMAP], and must indicate a media type as defined by
+# the MEDIATYPE_xxx constants in Defines.php
 
 
 image/gif      [BITMAP]
-image/png      [BITMAP]
+image/png image/x-png  [BITMAP]
 image/ief      [BITMAP]
 image/jpeg     [BITMAP]
+image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]
-image/x-icon   [BITMAP]
+image/x-icon image/x-ico       [BITMAP]
 image/x-rgb    [BITMAP]
 image/x-portable-pixmap                [BITMAP]
 image/x-portable-graymap image/x-portable-greymap      [BITMAP]
-image/x-bmp image/bmp application/x-bmp application/bmp        [BITMAP]
-image/x-photoshop image/psd image/x-psd image/photoshop        [BITMAP]
- 
-image/svg image/svg+xml application/svg+xml application/svg    [DRAWING]
+image/x-bmp image/x-ms-bmp image/bmp application/x-bmp application/bmp [BITMAP]
+image/x-photoshop image/psd image/x-psd image/photoshop image/vnd.adobe.photoshop      [BITMAP]
+image/vnd.djvu image/x.djvu image/x-djvu [BITMAP]
+image/webp     [BITMAP]
+
+image/svg+xml application/svg+xml application/svg image/svg    [DRAWING]
 application/postscript [DRAWING]
 application/x-latex    [DRAWING]
 application/x-tex      [DRAWING]
+application/x-dia-diagram [DRAWING]
 
 
-audio/mp3 audio/mpeg3 audio/mpeg       [AUDIO]
+audio/mpeg audio/mp3 audio/mpeg3       [AUDIO]
 audio/wav audio/x-wav audio/wave       [AUDIO]
 audio/midi audio/mid   [AUDIO]
 audio/basic            [AUDIO]
+audio/ogg              [AUDIO]
 audio/x-aiff           [AUDIO]
 audio/x-pn-realaudio   [AUDIO]
 audio/x-realaudio      [AUDIO]
+audio/webm             [AUDIO]
+audio/x-matroska       [AUDIO]
 
 video/mpeg application/mpeg    [VIDEO]
 video/ogg                      [VIDEO]
 video/x-sgi-video              [VIDEO]
+video/x-flv                    [VIDEO]
+video/webm                     [VIDEO]
+video/x-matroska               [VIDEO]
 
 application/ogg application/x-ogg audio/ogg audio/x-ogg video/ogg video/x-ogg          [MULTIMEDIA]
 
@@ -57,6 +67,7 @@ application/x-gzip    [ARCHIVE]
 application/x-bzip     [ARCHIVE]
 application/x-tar      [ARCHIVE]
 application/x-stuffit  [ARCHIVE]
+application/x-opc+zip  [ARCHIVE]
 
 
 text/javascript application/x-javascript application/x-ecmascript text/ecmascript      [EXECUTABLE]
@@ -74,3 +85,22 @@ application/vnd.ms-excel     [OFFICE]
 application/vnd.ms-powerpoint  [OFFICE]
 application/x-director         [OFFICE]
 text/rtf                       [OFFICE]
+
+application/vnd.openxmlformats-officedocument.wordprocessingml.document        [OFFICE]
+application/vnd.openxmlformats-officedocument.wordprocessingml.template                [OFFICE]
+application/vnd.ms-word.document.macroEnabled.12                               [OFFICE]
+application/vnd.ms-word.template.macroEnabled.12                               [OFFICE]
+application/vnd.openxmlformats-officedocument.presentationml.template          [OFFICE]
+application/vnd.openxmlformats-officedocument.presentationml.slideshow         [OFFICE]
+application/vnd.openxmlformats-officedocument.presentationml.presentation      [OFFICE]
+application/vnd.ms-powerpoint.addin.macroEnabled.12                            [OFFICE]
+application/vnd.ms-powerpoint.presentation.macroEnabled.12                     [OFFICE]
+application/vnd.ms-powerpoint.presentation.macroEnabled.12                     [OFFICE]
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12                                [OFFICE]
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet              [OFFICE]
+application/vnd.openxmlformats-officedocument.spreadsheetml.template           [OFFICE]
+application/vnd.ms-excel.sheet.macroEnabled.12                                 [OFFICE]
+application/vnd.ms-excel.template.macroEnabled.12                              [OFFICE]
+application/vnd.ms-excel.addin.macroEnabled.12                                 [OFFICE]
+application/vnd.ms-excel.sheet.binary.macroEnabled.12                          [OFFICE]
+application/acad application/x-acad application/autocad_dwg image/x-dwg application/dwg application/x-dwg application/x-autocad image/vnd.dwg drawing/dwg [DRAWING]