# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1275851717 -7200
# Node ID cd6ff5adae8423846b323c1ba324a5ddaa69110f
# Parent  e12266a4f473e9f182e135db040bbf73b7104d27# Parent  1ba48f78a0a582474754db83468bd850624c8775
merge

diff -r 1ba48f78a0a5 -r cd6ff5adae84 TODO
--- a/TODO	Wed Jun 02 22:54:08 2010 +0200
+++ b/TODO	Sun Jun 06 21:15:17 2010 +0200
@@ -42,6 +42,8 @@
 * Output SoE IDN configurations in 'ethercat config'.
 * Fix casting away constness during expected WC calculation.
 * Read AL status code on spontaneous state change.
+* Fix clearing domains etc. when not activated and releasing.
+* Output -EPROTO if mailbox protocol is not supported.
 * Only output watchdog config if not default.
 
 Future issues:
diff -r 1ba48f78a0a5 -r cd6ff5adae84 examples/dc_user/main.c
--- a/examples/dc_user/main.c	Wed Jun 02 22:54:08 2010 +0200
+++ b/examples/dc_user/main.c	Sun Jun 06 21:15:17 2010 +0200
@@ -143,7 +143,6 @@
 
         // check for master state (optional)
         check_master_state();
-
     }
 
     if (blink_counter) {