Mercurial > hg > nginx

comparison conf/mime.types @ 4169:432243531ce3 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100, r4106, r4107, r4108, r4113, r4156, r4157: *) ngx_http_mp4_module. *) "video/mp4" mime type added.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 15:13:47 +0000
parents cff87803b898
children d50883ff2433
comparison
equal deleted inserted replaced
4168:795761886688 4169:432243531ce3
63 audio/mpeg mp3; 63 audio/mpeg mp3;
64 audio/ogg ogg; 64 audio/ogg ogg;
65 audio/x-realaudio ra; 65 audio/x-realaudio ra;
66 66
67 video/3gpp 3gpp 3gp; 67 video/3gpp 3gpp 3gp;
68 video/mp4 mp4;
68 video/mpeg mpeg mpg; 69 video/mpeg mpeg mpg;
69 video/quicktime mov; 70 video/quicktime mov;
70 video/x-flv flv; 71 video/x-flv flv;
71 video/x-mng mng; 72 video/x-mng mng;
72 video/x-ms-asf asx asf; 73 video/x-ms-asf asx asf;