Merge r4006 back intro trunk.

Originally committed to SVN as r4069.
This commit is contained in:
Grigori Goronzy 2010-01-30 13:43:25 +00:00
parent b5064f8fc9
commit f84b51531a

View file

@ -10,3 +10,4 @@ Icon=aegisub
Terminal=false Terminal=false
Categories=AudioVideo;AudioVideoEditing; Categories=AudioVideo;AudioVideoEditing;
MimeType=application/x-srt;text/plain;text/x-ass;text/x-microdvd;text/x-ssa; MimeType=application/x-srt;text/plain;text/x-ass;text/x-microdvd;text/x-ssa;
StartupNotify=true