# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1346934062 -7200
# Node ID af21f0bdc7c98c5abf1d914acc02da2aee8ae232
# Parent  f35c7c8e6591971b1735042d5f1d69dc1ec66ce0# Parent  7ac02fa34e8b9e65453aae39f981650a94307dbe
merge.

diff -r 7ac02fa34e8b -r af21f0bdc7c9 configure.ac
--- a/configure.ac	Mon Aug 06 14:18:05 2012 +0200
+++ b/configure.ac	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#  $Id: configure.ac,v 97c7c202fa78 2012/01/09 14:16:40 fp $
+#  $Id$
 #
 #  Copyright (C) 2006-2009  Florian Pose, Ingenieurgemeinschaft IgH
 #
diff -r 7ac02fa34e8b -r af21f0bdc7c9 devices/e1000/Makefile.am
--- a/devices/e1000/Makefile.am	Mon Aug 06 14:18:05 2012 +0200
+++ b/devices/e1000/Makefile.am	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#  $Id: Makefile.am,v 9c0710c38627 2012/01/30 13:16:01 fp $
+#  $Id$
 #
 #  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
 #
diff -r 7ac02fa34e8b -r af21f0bdc7c9 devices/e1000e/Makefile.am
--- a/devices/e1000e/Makefile.am	Mon Aug 06 14:18:05 2012 +0200
+++ b/devices/e1000e/Makefile.am	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#  $Id: Makefile.am,v 8ebecea534d3 2012/01/30 14:12:21 fp $
+#  $Id$
 #
 #  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
 #
diff -r 7ac02fa34e8b -r af21f0bdc7c9 documentation/graphs/Makefile
--- a/documentation/graphs/Makefile	Mon Aug 06 14:18:05 2012 +0200
+++ b/documentation/graphs/Makefile	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #-----------------------------------------------------------------------------
 #
-# $Id: Makefile,v 0b19ac5acad2 2009/06/18 11:40:13 fp $
+# $Id$
 #
 #-----------------------------------------------------------------------------
 
diff -r 7ac02fa34e8b -r af21f0bdc7c9 examples/Kbuild.in
--- a/examples/Kbuild.in	Mon Aug 06 14:18:05 2012 +0200
+++ b/examples/Kbuild.in	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#  $Id: Kbuild.in 1097 2008-04-03 15:31:34Z fp $
+#  $Id$
 #
 #  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
 #
diff -r 7ac02fa34e8b -r af21f0bdc7c9 examples/dc_rtai/Kbuild.in
--- a/examples/dc_rtai/Kbuild.in	Mon Aug 06 14:18:05 2012 +0200
+++ b/examples/dc_rtai/Kbuild.in	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#  $Id: Kbuild.in 1667 2009-02-24 12:51:39Z fp $
+#  $Id$
 #
 #  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
 #
diff -r 7ac02fa34e8b -r af21f0bdc7c9 examples/tty/serial.c
--- a/examples/tty/serial.c	Mon Aug 06 14:18:05 2012 +0200
+++ b/examples/tty/serial.c	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id: serial.c,v 8e173dddd183 2010/10/25 14:45:33 fp $
+ *  $Id$
  *
  *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
  *
diff -r 7ac02fa34e8b -r af21f0bdc7c9 lib/common.c
--- a/lib/common.c	Mon Aug 06 14:18:05 2012 +0200
+++ b/lib/common.c	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id: common.c,v 8e173dddd183 2010/10/25 14:45:33 fp $
+ *  $Id$
  *
  *  Copyright (C) 2006-2009  Florian Pose, Ingenieurgemeinschaft IgH
  *
diff -r 7ac02fa34e8b -r af21f0bdc7c9 master/fsm_master.c
--- a/master/fsm_master.c	Mon Aug 06 14:18:05 2012 +0200
+++ b/master/fsm_master.c	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id: fsm_master.c,v afb40fd6018e 2011/09/16 12:10:23 fp $
+ *  $Id$
  *
  *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
  *
diff -r 7ac02fa34e8b -r af21f0bdc7c9 master/fsm_slave.c
--- a/master/fsm_slave.c	Mon Aug 06 14:18:05 2012 +0200
+++ b/master/fsm_slave.c	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id: fsm_slave.c,v 83e9160319ec 2011/08/01 15:02:45 fp $
+ *  $Id$
  *
  *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
  *
diff -r 7ac02fa34e8b -r af21f0bdc7c9 master/fsm_slave_config.c
--- a/master/fsm_slave_config.c	Mon Aug 06 14:18:05 2012 +0200
+++ b/master/fsm_slave_config.c	Thu Sep 06 14:21:02 2012 +0200
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id: fsm_slave_config.c,v ff2a13a4603c 2011/03/14 15:55:09 ch1010277 $
+ *  $Id$
  *
  *  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
  *