Add new format option when mixing EFF/SFF frame output

[sojka/can-utils.git] / terminal.h

diff --git a/terminal.h b/terminal.h
index 0a440d32ba753a96a3d525fbcf2f9f78c701dd6e..1b7c1e70005beb7e8a8cbfb90260ebaa5b55ab2e 100644 (file)
--- a/terminal.h
+++ b/terminal.h
@@ -1,17 +1,16 @@
 /*
- *  $Id: terminal.h,v 2.0 2006/04/13 10:37:21 ethuerm Exp $
+ *  $Id$
  */
 
 /*
- * Copyright (c) 2002-2005 Volkswagen Group Electronic Research
+ * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, the following disclaimer and
- *    the referenced file 'COPYING'.
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
@@ -21,8 +20,8 @@
  *
  * Alternatively, provided that this notice is retained in full, this
  * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2 as distributed in the 'COPYING'
- * file from the main directory of the linux kernel source.
+ * Public License ("GPL") version 2, in which case the provisions of the
+ * GPL apply INSTEAD OF those given above.
  *
  * The provided data structures and external interfaces from this code
  * are not restricted to be used by modules with a GPL compatible license.
@@ -40,7 +39,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <llcf@volkswagen.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */