Merge branch 'toys'

This commit is contained in:
Vincent Riquer 2013-07-01 00:53:08 +02:00
commit da4fe1c67a

View File

@ -301,6 +301,9 @@ do
audio/x-flac) type=FLAC ;;
video/mpeg) type=MPEG\ Video;;
video/webm) type=WebM ;;
video/x-flv) type=Flash\ Video;;
video/x-ms-asf) type=Windows\ Media;;
video/x-msvideo) type=AVI\ Video ;;
audio/*) type=Other\ Audio;;
video/*) type=Other\ Video;;
*) type=Other ;;