aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/gui/component/openldap-extract.h21
-rw-r--r--widgets/misc/ChangeLog1
-rw-r--r--widgets/misc/e-icon-entry.h21
-rw-r--r--widgets/misc/e-reflow-model.c24
5 files changed, 6 insertions, 65 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 28c3f4f4ca..3d4b18711b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-06 Michael Meeks <michael.meeks@novell.com>
+
+ * gui/component/openldap-extract.h: License fixes.
+
2008-09-04 Sankar P <psankar@novell.com>
License Changes
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index 9cf407324a..f11012ec40 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -1,24 +1,3 @@
-/*
- *
- * 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:
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
/* This is extracted from the OpenLDAP sources.
*
* Stuff that isn't used in e-book-backend-ldap.c was dropped, like
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index ffa1c66f85..53a6086062 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,6 +1,7 @@
2008-09-06 Michael Meeks <michael.meeks@novell.com>
* e-spinner.c: correct licensing cockup; apologies.
+ * e-icon-entry.h: ditto.
2008-09-04 Sankar P <psankar@novell.com>
diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h
index d5ee43cb06..894cb16c4f 100644
--- a/widgets/misc/e-icon-entry.h
+++ b/widgets/misc/e-icon-entry.h
@@ -1,25 +1,4 @@
/*
- *
- * 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:
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-/*
* e-icon-entry.h
*
* Authors: Johnny Jacob <jjohnny@novell.com>
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 418d19c20a..8f206e20c6 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
*
* This program is free software; you can redistribute it and/or
@@ -19,29 +20,6 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-reflow-model.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- * Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
#include <config.h>
#include "e-util/e-util-marshal.h"