banshee r2987 - in trunk/banshee: . data

[gburt svn gnome org]

Author: gburt
Date: Fri Jan 18 17:32:17 2008
New Revision: 2987
URL: http://svn.gnome.org/viewvc/banshee?rev=2987&view=rev

Log:
2008-01-18  Gabriel Burt  <gabriel burt gmail com>

	* data/banshee.desktop.in.in: Merge x-content/* support from stable.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/data/banshee.desktop.in.in

Modified: trunk/banshee/data/banshee.desktop.in.in
==============================================================================
--- trunk/banshee/data/banshee.desktop.in.in	(original)
+++ trunk/banshee/data/banshee.desktop.in.in	Fri Jan 18 17:32:17 2008
@@ -14,4 +14,5 @@
 X-GNOME-Bugzilla-Product=banshee
 X-GNOME-Bugzilla-Component=General
 X-GNOME-Bugzilla-Version= VERSION@
-MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-m4a;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it
+MimeType=application/musepack;application/x-musepack;audio/musepack;audio/x-musepack;audio/mp;audio/x-mp;audio/mpc;audio/x-mpc;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;application/ogg;application/x-ogg;audio/ogg;audio/x-ogg;application/x-flac;audio/flac;audio/x-flac;audio/vorbis;audio/x-vorbis;application/x-ape;audio/ape;audio/x-ape;application/x-id3;audio/mp3;audio/mpeg;audio/mpeg3;audio/x-mp3;audio/x-mpeg;audio/x-mpeg-3;audio/x-m4a;x-content/audio-cdda;x-content/audio-dvd;x-content/audio-player;
+