diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
commit | 85b2913a380c69f14ae0254ad23b10fabfb33667 (patch) | |
tree | c1cf143e37294dd9dd3667ebbe0a1d0c00b04b56 /plugins/audio-inline | |
parent | e7a31c5035a0afeed6c1675e30487c1e2bdc139f (diff) | |
download | gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.gz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.zst gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.zip |
Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
Diffstat (limited to 'plugins/audio-inline')
-rw-r--r-- | plugins/audio-inline/ChangeLog | 6 | ||||
-rw-r--r-- | plugins/audio-inline/audio-inline.c | 24 |
2 files changed, 25 insertions, 5 deletions
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index 5b82ad2fc6..7ec5b04a59 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * audio-inline.c: + 2008-09-24 Philip Withnall <philip@tecnocode.co.uk> ** Fixes bug #553479 diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 405c3d87d6..2568117b5a 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -1,11 +1,25 @@ /* - Copyright (C) 2004 Novell, Inc. - Author: Radek Doulik - + * 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) version 3. + * + * 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + * + * Authors: + * Radek Doulik <rodo@ximian.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ -/* This file is licensed under the GNU GPL v2 or later */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif |