aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-05-14 00:26:29 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-05-14 00:26:29 +0800
commitcbcb17c26d3154385310bd97d45901bef91d92ae (patch)
treeab18207b3d46cbcfe2bb8e6b3ca4e11ebea7cd06
parent76fa3d1b53ac22d8d63b280a412a4364eaaccc0b (diff)
downloadgsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar.gz
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar.bz2
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar.lz
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar.xz
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.tar.zst
gsoc2013-empathy-cbcb17c26d3154385310bd97d45901bef91d92ae.zip
sync totem-subtitle-encoding.c with totem as the file was properly relicensed (Guillaume Desmottes)
svn path=/trunk/; revision=1099
-rw-r--r--libempathy-gtk/totem-subtitle-encoding.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c
index e0eef082c..0fb892ad2 100644
--- a/libempathy-gtk/totem-subtitle-encoding.c
+++ b/libempathy-gtk/totem-subtitle-encoding.c
@@ -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