# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1162907270 0
# Node ID 69f0fbc0dcab3aa33dde3ea22b2b2ed038a6a3f9
# Parent  1cc865ba17c21d812efda03fbba3444a0682a9f5
MERGE trunk -r682:685 -> branches/stable-1.1 (Fixed dist files, source docs, version 1.1.1)

diff -r 1cc865ba17c2 -r 69f0fbc0dcab Makefile.am
--- a/Makefile.am	Tue Nov 07 12:13:30 2006 +0000
+++ b/Makefile.am	Tue Nov 07 13:47:50 2006 +0000
@@ -36,12 +36,11 @@
 DIST_SUBDIRS = master devices script include examples
 
 EXTRA_DIST = \
-	bootstrap \
 	documentation/ethercat_doc.pdf \
 	Doxyfile \
 	FEATURES \
 	globals.h \
-	LICENSE
+	Kbuild
 
 modules:
 	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
diff -r 1cc865ba17c2 -r 69f0fbc0dcab include/ecrt.h
--- a/include/ecrt.h	Tue Nov 07 12:13:30 2006 +0000
+++ b/include/ecrt.h	Tue Nov 07 13:47:50 2006 +0000
@@ -120,7 +120,9 @@
 
 ec_slave_t *ecrt_master_get_slave(const ec_master_t *, const char *);
 
+/** \cond */
 int ecrt_master_state(const ec_master_t *master);
+/** \endcond */
 
 /******************************************************************************
  *  Domain Methods
diff -r 1cc865ba17c2 -r 69f0fbc0dcab master/fsm.h
--- a/master/fsm.h	Tue Nov 07 12:13:30 2006 +0000
+++ b/master/fsm.h	Tue Nov 07 13:47:50 2006 +0000
@@ -90,9 +90,12 @@
 int ec_fsm_success(ec_fsm_t *);
 
 // TODO: layout slave state machines
+
+/** \cond */
 void ec_fsm_slaveconf_state_start(ec_fsm_t *);
 void ec_fsm_slave_state_end(ec_fsm_t *);
 void ec_fsm_slave_state_error(ec_fsm_t *);
+/** \endcond */
 
 /*****************************************************************************/