Imported Upstream version 3.0.0

[glabels] / src / merge-text.h

diff --git a/src/merge-text.h b/src/merge-text.h
index 65bad54d673ba7361b62269655a1f1c293280229..e4180f1ff8fd774695a151a6efa65958247c3d4c 100644 (file)
--- a/src/merge-text.h
+++ b/src/merge-text.h
@@ -1,26 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  merge_text.h:  text-file merge backend module header file
+ *  merge-text.h
+ *  Copyright (C) 2002-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 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/>.
  */
+
 #ifndef __MERGE_TEXT_H__
 #define __MERGE_TEXT_H__
 
@@ -33,6 +30,7 @@ G_BEGIN_DECLS
  * name               type             description
  * ---------------------------------------------------------------------------
  * delim              gchar            Field delimiter.
+ * line1_has_keys     gboolean         Do we harvest key names from line 1?
  *
  */
 
@@ -66,3 +64,14 @@ GType             gl_merge_text_get_type            (void) G_GNUC_CONST;
 G_END_DECLS
 
 #endif
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */