Mon, 26 Jan 2009 13:28:19 +0000merge -c1621 branches/1.4-foe: Introduced configured_[tr]x_mailbox(size|offset) members of slave.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 13:28:19 +0000] rev 1338
merge -c1621 branches/1.4-foe: Introduced configured_[tr]x_mailbox(size|offset) members of slave.

Mon, 26 Jan 2009 13:22:05 +0000merge -c1619 branches/1.4-foe: Implemented going to bootstrap state BOOT.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 13:22:05 +0000] rev 1337
merge -c1619 branches/1.4-foe: Implemented going to bootstrap state BOOT.

Mon, 26 Jan 2009 13:09:27 +0000merge -c1618 branches/1.4-foe: Improved FoE.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 13:09:27 +0000] rev 1336
merge -c1618 branches/1.4-foe: Improved FoE.

Mon, 26 Jan 2009 13:01:58 +0000merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 13:01:58 +0000] rev 1335
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.

Mon, 26 Jan 2009 11:59:32 +0000merge -c1617 branches/stable-1.4: Added octet_string as an SDO data type.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:59:32 +0000] rev 1334
merge -c1617 branches/stable-1.4: Added octet_string as an SDO data type.

Mon, 26 Jan 2009 11:59:07 +0000merge -c1614 branches/stable-1.4: Fixed datagram cleaning.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:59:07 +0000] rev 1333
merge -c1614 branches/stable-1.4: Fixed datagram cleaning.

Mon, 26 Jan 2009 11:58:35 +0000merge -c1610 branches/stable-1.4: Added missing doxygen docs.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:58:35 +0000] rev 1332
merge -c1610 branches/stable-1.4: Added missing doxygen docs.

Mon, 26 Jan 2009 11:51:53 +0000merge -c1609 branches/stable-1.4: INSTALL, README.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:51:53 +0000] rev 1331
merge -c1609 branches/stable-1.4: INSTALL, README.

Mon, 26 Jan 2009 11:49:26 +0000TODO.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:49:26 +0000] rev 1330
TODO.

Mon, 26 Jan 2009 11:46:38 +0000merge -c1606 branches/stable-1.4: Output vendor Id in hex.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:46:38 +0000] rev 1329
merge -c1606 branches/stable-1.4: Output vendor Id in hex.

Mon, 26 Jan 2009 11:46:02 +0000merge -c1605 branches/stable-1.4: Output ioctl() debugging in hex.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:46:02 +0000] rev 1328
merge -c1605 branches/stable-1.4: Output ioctl() debugging in hex.

Mon, 26 Jan 2009 11:45:30 +0000merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:45:30 +0000] rev 1327
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.

Mon, 26 Jan 2009 11:16:10 +0000merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:16:10 +0000] rev 1326
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.

Mon, 26 Jan 2009 10:34:53 +0000merge -c1602 branches/stable-1.4: Fixed e1000 ring bug.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:34:53 +0000] rev 1325
merge -c1602 branches/stable-1.4: Fixed e1000 ring bug.

Mon, 26 Jan 2009 10:30:53 +0000merge -c1601 branches/stable-1.4: Ignores.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:30:53 +0000] rev 1324
merge -c1601 branches/stable-1.4: Ignores.

Mon, 26 Jan 2009 10:30:17 +0000merge -r1599:1600 branches/stable-1.4: Removed bashisms from init script.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:30:17 +0000] rev 1323
merge -r1599:1600 branches/stable-1.4: Removed bashisms from init script.