diff options
author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-05-14 00:26:29 +0800 |
---|---|---|
committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-05-14 00:26:29 +0800 |
commit | 919fa6c1c5330bca818d624077a3376817795166 (patch) | |
tree | ab18207b3d46cbcfe2bb8e6b3ca4e11ebea7cd06 | |
parent | bc1087db6189f443044f4f88f9b412309db76584 (diff) | |
download | gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar.gz gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar.bz2 gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar.lz gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar.xz gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.tar.zst gsoc2013-empathy-919fa6c1c5330bca818d624077a3376817795166.zip |
sync totem-subtitle-encoding.c with totem as the file was properly relicensed (Guillaume Desmottes)
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1099 4ee84921-47dd-4033-b63a-18d7a039a3e4
-rw-r--r-- | libempathy-gtk/totem-subtitle-encoding.c | 18 |
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 |