empathy r1099 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue May 13 16:26:29 2008
New Revision: 1099
URL: http://svn.gnome.org/viewvc/empathy?rev=1099&view=rev

Log:
sync totem-subtitle-encoding.c with totem as the file was properly relicensed (Guillaume Desmottes)


Modified:
   trunk/libempathy-gtk/totem-subtitle-encoding.c

Modified: trunk/libempathy-gtk/totem-subtitle-encoding.c
==============================================================================
--- trunk/libempathy-gtk/totem-subtitle-encoding.c	(original)
+++ trunk/libempathy-gtk/totem-subtitle-encoding.c	Tue May 13 16:26:29 2008
@@ -3,19 +3,19 @@
  *
  * encoding list copied from gnome-terminal/encoding.c
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * The Totem project hereby grant permission for non-gpl compatible GStreamer
  * plugins to be used and distributed together with GStreamer and Totem. This