Skip to content
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@2162 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent 0a85e14 commit c97aad521a0c9d86d380e5c02daca5728ba2a36a @alobbs alobbs committed Oct 13, 2008
Showing with 4 additions and 3 deletions.
  1. +2 −0 ChangeLog
  2. +2 −3 cherokee.conf.sample.pre
View
2 ChangeLog
@@ -1,5 +1,7 @@
2008-10-13 Alvaro Lopez Ortega <alvaro@octality.com>
+ * cherokee.conf.sample.pre: Removed a few duped entries.
+
* cherokee/mime.c (cherokee_mime_get_by_suffix),
cherokee/icons.c (add_suffix): Better error management.
View
5 cherokee.conf.sample.pre
@@ -88,9 +88,9 @@ icons!suffix!page_white_acrobat.png = pdf
icons!suffix!page_white_office.png = doc,ppt,xls
icons!suffix!page_white_text.png = txt,text,rtf,sdw
icons!suffix!font.png = ttf
-icons!suffix!music.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,m3u,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
+icons!suffix!music.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
icons!suffix!package.png = tar,gz,bz2,zip,rar,ace,lha,Z,z,7z
-icons!suffix!film.png = avi,mpeg,mpga,mpe,mpg,mpeg3,mp2,dl,fli,qt,mov,movie
+icons!suffix!film.png = avi,mpeg,mpe,mpg,mpeg3,dl,fli,qt,mov,movie
icons!suffix!cup.png = java,class,jar
icons!suffix!cd.png = iso,ngr,cue
icons!suffix!camera.png = jpg,jpeg,jpe
@@ -260,7 +260,6 @@ mime!application/zip!extensions = zip
mime!audio/basic!extensions = au,snd
mime!audio/midi!extensions = mid,midi,kar
mime!audio/mpeg!extensions = mpga,mpega,mp2,mp3,m4a
-mime!audio/mpegurl!extensions = m3u
mime!audio/prs.sid!extensions = sid
mime!audio/x-aiff!extensions = aif,aiff,aifc
mime!audio/x-gsm!extensions = gsm

0 comments on commit c97aad5

Please sign in to comment.
Something went wrong with that request. Please try again.