# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1191403141 0
# Node ID f1a23fd26052999878dbff4af04887a9d6bdc272
# Parent  ff09257b2c0f4cc2b9118532820f6903ba75adbc
merge -r969:970 branches/stable-1.3 -> trunk (fsm_coe_map.[ch] to dist)

diff -r ff09257b2c0f -r f1a23fd26052 master/Makefile.am
--- a/master/Makefile.am	Wed Oct 03 08:53:00 2007 +0000
+++ b/master/Makefile.am	Wed Oct 03 09:19:01 2007 +0000
@@ -46,6 +46,7 @@
 	fsm_sii.c fsm_sii.h \
 	fsm_change.c fsm_change.h \
 	fsm_coe.c fsm_coe.h \
+	fsm_coe_map.c fsm_coe_map.h \
 	fsm_mapping.c fsm_mapping.h \
 	fsm_slave.c fsm_slave.h \
 	fsm_master.c fsm_master.h \