2009-09-17 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / merge-init.c

diff --git a/glabels2/src/merge-init.c b/glabels2/src/merge-init.c
index b62551bede5bb91bf5f7c5adc4da36f001294218..9d5756444ec0d5bfd5ce6b37abd737db7c6a7c1a 100644 (file)
--- a/glabels2/src/merge-init.c
+++ b/glabels2/src/merge-init.c
@@ -1,32 +1,30 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  merge.c:  document merge initialization
+ *  merge-init.c
+ *  Copyright (C) 2002-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2001-2002  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels 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.
  *
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 
 #include <glib/gi18n.h>
 
 #include "merge-init.h"
 #include "merge-text.h"
+
 #ifdef HAVE_LIBEBOOK
 #include "merge-evolution.h"
 #include "merge-vcard.h"
@@ -92,3 +90,14 @@ gl_merge_init (void)
 #endif /* HAVE_LIBEBOOK */
 
 }
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */