evolution r36263 - in trunk: addressbook addressbook/gui/component widgets/misc

[michael svn gnome org]

Author: michael
Date: Sat Sep  6 14:45:00 2008
New Revision: 36263
URL: http://svn.gnome.org/viewvc/evolution?rev=36263&view=rev

Log:
fix licensing snafus.


Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/component/openldap-extract.h
   trunk/widgets/misc/ChangeLog
   trunk/widgets/misc/e-icon-entry.h
   trunk/widgets/misc/e-reflow-model.c

Modified: trunk/addressbook/gui/component/openldap-extract.h
==============================================================================
--- trunk/addressbook/gui/component/openldap-extract.h	(original)
+++ trunk/addressbook/gui/component/openldap-extract.h	Sat Sep  6 14:45:00 2008
@@ -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

Modified: trunk/widgets/misc/e-icon-entry.h
==============================================================================
--- trunk/widgets/misc/e-icon-entry.h	(original)
+++ trunk/widgets/misc/e-icon-entry.h	Sat Sep  6 14:45:00 2008
@@ -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>

Modified: trunk/widgets/misc/e-reflow-model.c
==============================================================================
--- trunk/widgets/misc/e-reflow-model.c	(original)
+++ trunk/widgets/misc/e-reflow-model.c	Sat Sep  6 14:45:00 2008
@@ -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"