--- a/ChangeLog	Tue Jan 02 12:47:11 2007 +0000
+++ b/ChangeLog	Tue Jan 02 13:15:02 2007 +0000
@@ -1,3 +1,88 @@
+2007-01-02 12:47  fp
+
+	* configure.ac: Configuring for kernels 2.6.18 and 2.6.19, thanks
+	  to Ralf Roesch.
+
+2007-01-01 14:58  fp
+
+	* configure.ac: Made it possible to configure under kernel 2.6.18.
+
+2006-12-18 18:10  fp
+
+	* master/fsm.c, master/fsm.h, master/fsm_change.c,
+	  master/fsm_change.h, master/fsm_coe.c, master/fsm_coe.h,
+	  master/fsm_sii.c, master/fsm_sii.h, master/globals.h: State
+	  machines re-send datagrams on timeout.
+
+2006-12-18 17:53  fp
+
+	* master/mailbox.c: Improved error messages in mailbox.c
+
+2006-12-18 11:54  fp
+
+	* script/ethercat.sh: Removed absolute paths for networking
+	  commands; brctl show without additional parameter.
+
+2006-12-18 11:51  fp
+
+	* master/master.c: Fixed warnings in master.c.
+
+2006-12-18 11:48  fp
+
+	* master/fsm_coe.c: Fixed typo in CoE FSM.
+
+2006-12-18 11:00  fp
+
+	* master/master.c: Corrected error messages in get_slave().
+
+2006-12-08 11:52  fp
+
+	* master/slave.c, master/slave.h, script/lsec.pl: Current
+	  consumption in sysfs; "lsec -c" shows current consumption and
+	  remaining current.
+
+2006-12-08 11:49  fp
+
+	* devices/ecdev.h: Fixed return type of ecdev_close().
+
+2006-12-08 11:39  fp
+
+	* NEWS, devices/8139too-2.6.13-ethercat.c,
+	  devices/8139too-2.6.17-ethercat.c, devices/ecdev.h,
+	  master/module.c: Re-introduced ecdev_open() and ecdev_close(), to
+	  avoid a race condition regarding the link state.
+
+2006-11-24 11:09  fp
+
+	* master/master.c: Fixed lost frames display bug when no frames
+	  were sent.
+
+2006-11-24 11:02  fp
+
+	* AUTHORS, NEWS, bootstrap, devices/8139too-2.6.13-ethercat.c,
+	  devices/8139too-2.6.17-ethercat.c, devices/ecdev.h,
+	  include/ecrt.h, master/domain.c, master/domain.h,
+	  master/master.c, master/master.h, master/module.c: Interface
+	  changes for version 1.2, see NEWS file.
+
+2006-11-23 20:19  fp
+
+	* configure.ac, include/ecrt.h, master/domain.c: Version 1.2.0-rc1,
+	  re-introduced ecrt_domain_queue().
+
+2006-11-21 15:46  fp
+
+	* master/device.c, master/device.h, master/master.c: Added frame
+	  counter.
+
+2006-11-21 15:13  fp
+
+	* master/master.c, master/master.h: Introduced "starved" datagrams.
+
+2006-11-07 13:49  fp
+
+	* ChangeLog: Updated ChangeLog
+
 2006-11-07 13:39  fp
 
 	* configure.ac: VERSION 1.1.1

--- a/NEWS	Tue Jan 02 12:47:11 2007 +0000
+++ b/NEWS	Tue Jan 02 13:15:02 2007 +0000
@@ -6,20 +6,24 @@
 
 Changes in version 1.2.0:
 
-* Re-introduced ecrt_domain_queue() to allow datagram queuing apart
-  from datagram processing. The queuing of a domain's datagrams is not
-  done in ecrt_domain_process() any more!
-* Removed ecrt_master_deactivate(). Its functionality was moved into
-  ecrt_master_release().
-* Removed ecrt_master_prepare(). Its functionality was moved into
-  ecrt_master_activate().
-* Renamed ecdev_start() and ecdev_stop() to ecdev_open() and ecdev_close().
-  These two functions now take a pointer to ec_device_t as their arguments.
-* The data_ptr parameter of ecrt_domain_register_pdo(),
-  ecrt_domain_register_pdo_list() and ecrt_domain_register_pdo_range() may
-  not be NULL any more.
-* Removed ecrt_slave_pdo_size(). This function was deprecated long before.
-* Added frame counter to master info file.
+* Interface changes:
+  - Re-introduced ecrt_domain_queue() to allow datagram queuing apart
+    from datagram processing. The queuing of a domain's datagrams is not
+    done in ecrt_domain_process() any more!
+  - Removed ecrt_master_deactivate(). Its functionality was moved into
+    ecrt_master_release().
+  - Removed ecrt_master_prepare(). Its functionality was moved into
+    ecrt_master_activate().
+  - Renamed ecdev_start() and ecdev_stop() to ecdev_open() and ecdev_close().
+    These two functions now take a pointer to ec_device_t as their arguments.
+  - The data_ptr parameter of ecrt_domain_register_pdo(),
+    ecrt_domain_register_pdo_list() and ecrt_domain_register_pdo_range() may
+    not be NULL any more.
+  - Removed ecrt_slave_pdo_size(). This function was deprecated long before.
+* State machines now try to re-send datagrams on datagram timeout.
+* New option -c of the lsec script, displays slave current consumptions and
+  remaining current.
+* Added frame counter in master info file.
 
 -------------------------------------------------------------------------------