diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-02 04:56:04 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-02 04:56:04 +0800 |
| commit | b2cda1d0c6d44f53f71bad9e256f41188677dfba (patch) | |
| tree | 65bd7560e802baf1740482ae48b952dc5c5957fc /plugins/startup-wizard | |
| parent | e52986f4225cbe8496043da74ca250521d244705 (diff) | |
| download | gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.gz gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.bz2 gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.lz gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.xz gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.zst gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.zip | |
Merge revisions 36016:36533 from trunk.
svn path=/branches/kill-bonobo/; revision=36534
Diffstat (limited to 'plugins/startup-wizard')
| -rw-r--r-- | plugins/startup-wizard/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 26 |
2 files changed, 20 insertions, 12 deletions
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog index faeebb70f1..4d636b826a 100644 --- a/plugins/startup-wizard/ChangeLog +++ b/plugins/startup-wizard/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * startup-wizard.c: + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #529460 diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 32cf21a217..f9594364d9 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * JP Rosevear <jpr@novell.com> - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * 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 - * General Public License for more details. + * 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: + * JP Rosevear <jpr@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include <gconf/gconf-client.h> |