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/plugin-manager/ChangeLog | 6 ++++++ plugins/plugin-manager/plugin-manager.c | 26 +++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) (limited to 'plugins/plugin-manager') diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog index 9e1292570c..1b3d52084a 100644 --- a/plugins/plugin-manager/ChangeLog +++ b/plugins/plugin-manager/ChangeLog @@ -1,3 +1,9 @@ +2008-09-04 Sankar P + +License Changes + + * plugin-manager.c: + 2008-06-18 Matthew Barnes ** Fixes bug #530069 diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index ba3722abfa..4658291679 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -1,8 +1,24 @@ - -/* Copyright (C) 2004 Novell Inc. - by Michael Zucchi */ - -/* This file is licensed under the GNU GPL v2 or later */ +/* + * 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 + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ /* A plugin manager ui */ -- cgit v1.2.3