comparison conf/mime.types @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents da3c99095432
children 9ad199846233
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
33 application/vnd.ms-powerpoint ppt; 33 application/vnd.ms-powerpoint ppt;
34 application/vnd.wap.wmlc wmlc; 34 application/vnd.wap.wmlc wmlc;
35 application/vnd.wap.xhtml+xml xhtml; 35 application/vnd.wap.xhtml+xml xhtml;
36 application/vnd.google-earth.kml+xml kml; 36 application/vnd.google-earth.kml+xml kml;
37 application/vnd.google-earth.kmz kmz; 37 application/vnd.google-earth.kmz kmz;
38 application/x-7z-compressed 7z;
38 application/x-cocoa cco; 39 application/x-cocoa cco;
39 application/x-java-archive-diff jardiff; 40 application/x-java-archive-diff jardiff;
40 application/x-java-jnlp-file jnlp; 41 application/x-java-jnlp-file jnlp;
41 application/x-makeself run; 42 application/x-makeself run;
42 application/x-perl pl pm; 43 application/x-perl pl pm;