From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- plugins/tnef-attachments/ChangeLog | 11 +++++++++++ plugins/tnef-attachments/tnef-plugin.c | 22 ++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'plugins/tnef-attachments') diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog index 0a7c857cb9..669d4373ca 100644 --- a/plugins/tnef-attachments/ChangeLog +++ b/plugins/tnef-attachments/ChangeLog @@ -1,3 +1,14 @@ +2008-09-03 Sankar P + + * plugins/tnef-attachments/tnef-plugin.c: + Assign copyrights to Randall Hand. + +2008-08-27 Sankar P + +License Changes + + * tnef-plugin.c: + 2008-03-31 Frederic Crozat ** Fix for bug #501885 diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 483ed35afd..e7b5d624eb 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -1,5 +1,23 @@ -/* Copyright (C) 2005 Novell Inc. */ -/* This file is licensed under the GNU GPL v2 */ +/* + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright (C) Randall Hand + * + */ #ifdef HAVE_CONFIG_H #include "config.h" -- cgit v1.2.3