Tue, 13 Feb 2007 13:42:37 +0000MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one). stable-1.2
Florian Pose <fp@igh-essen.com> [Tue, 13 Feb 2007 13:42:37 +0000] rev 1739
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).

Tue, 13 Feb 2007 13:36:31 +0000Re-added sysconfig file. stable-1.2
Florian Pose <fp@igh-essen.com> [Tue, 13 Feb 2007 13:36:31 +0000] rev 1738
Re-added sysconfig file.

Tue, 13 Feb 2007 13:27:44 +0000Temporarily removed sysconfig script. stable-1.2
Florian Pose <fp@igh-essen.com> [Tue, 13 Feb 2007 13:27:44 +0000] rev 1737
Temporarily removed sysconfig script.

Tue, 13 Feb 2007 13:18:20 +0000Removed traces of XML daemon from stable branch. stable-1.2
Florian Pose <fp@igh-essen.com> [Tue, 13 Feb 2007 13:18:20 +0000] rev 1736
Removed traces of XML daemon from stable branch.

Tue, 13 Feb 2007 13:08:35 +0000Created branch stable-1.2. stable-1.2
Florian Pose <fp@igh-essen.com> [Tue, 13 Feb 2007 13:08:35 +0000] rev 1735
Created branch stable-1.2.

Tue, 07 Nov 2006 13:50:03 +0000MERGE trunk -r686:687 -> branches/stable-1.1 (ChangeLog) stable-1.1
Florian Pose <fp@igh-essen.com> [Tue, 07 Nov 2006 13:50:03 +0000] rev 1734
MERGE trunk -r686:687 -> branches/stable-1.1 (ChangeLog)

Tue, 07 Nov 2006 13:47:50 +0000MERGE trunk -r682:685 -> branches/stable-1.1 (Fixed dist files, source docs, version 1.1.1) stable-1.1
Florian Pose <fp@igh-essen.com> [Tue, 07 Nov 2006 13:47:50 +0000] rev 1733
MERGE trunk -r682:685 -> branches/stable-1.1 (Fixed dist files, source docs, version 1.1.1)

Tue, 07 Nov 2006 12:13:30 +0000MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation) stable-1.1
Florian Pose <fp@igh-essen.com> [Tue, 07 Nov 2006 12:13:30 +0000] rev 1732
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)

Fri, 13 Oct 2006 10:07:10 +0000MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 13 Oct 2006 10:07:10 +0000] rev 1731
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)

Thu, 28 Sep 2006 08:31:33 +0000MERGE trunk -r571:572 -> branches/stable-1.1 (INSTALL file) stable-1.1
Florian Pose <fp@igh-essen.com> [Thu, 28 Sep 2006 08:31:33 +0000] rev 1730
MERGE trunk -r571:572 -> branches/stable-1.1 (INSTALL file)

Wed, 27 Sep 2006 15:25:04 +0000MERGE trunk -r569:570 -> branches/stable-1.1 (doc) stable-1.1
Florian Pose <fp@igh-essen.com> [Wed, 27 Sep 2006 15:25:04 +0000] rev 1729
MERGE trunk -r569:570 -> branches/stable-1.1 (doc)

Tue, 26 Sep 2006 16:38:38 +0000MERGE trunk -r564:568 -> branches/stable-1.1 (doc, master output, atomic flag) stable-1.1
Florian Pose <fp@igh-essen.com> [Tue, 26 Sep 2006 16:38:38 +0000] rev 1728
MERGE trunk -r564:568 -> branches/stable-1.1 (doc, master output, atomic flag)

Mon, 25 Sep 2006 17:28:31 +0000MERGE trunk -r556:562 -> branches/stable-1.1 (new doc) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 25 Sep 2006 17:28:31 +0000] rev 1727
MERGE trunk -r556:562 -> branches/stable-1.1 (new doc)

Mon, 25 Sep 2006 14:40:23 +0000MERGE trunk -r 554:555 -> branches/stable-1.1 (--with-linux fix) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 25 Sep 2006 14:40:23 +0000] rev 1726
MERGE trunk -r 554:555 -> branches/stable-1.1 (--with-linux fix)

Mon, 25 Sep 2006 14:17:44 +0000MERGE trunk -r 552:553 -> branches/stable-1.1 (--with-linux, mydist) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 25 Sep 2006 14:17:44 +0000] rev 1725
MERGE trunk -r 552:553 -> branches/stable-1.1 (--with-linux, mydist)

Mon, 25 Sep 2006 12:20:44 +0000MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 25 Sep 2006 12:20:44 +0000] rev 1724
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)

Mon, 25 Sep 2006 12:15:36 +0000MERGE: trunk -r543:544 -> branches/stable-1.1 (Indentation init script) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 25 Sep 2006 12:15:36 +0000] rev 1723
MERGE: trunk -r543:544 -> branches/stable-1.1 (Indentation init script)

Mon, 11 Sep 2006 09:28:26 +0000MERGE trunk -r537:540 -> branches/stable-1.1 (coupler info in sysfs, lines in lsec) stable-1.1
Florian Pose <fp@igh-essen.com> [Mon, 11 Sep 2006 09:28:26 +0000] rev 1722
MERGE trunk -r537:540 -> branches/stable-1.1 (coupler info in sysfs, lines in lsec)

Fri, 08 Sep 2006 13:06:09 +0000MERGE trunk -r534:537 -> branches/stable-1.1 (INSTALL file, Version info) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 08 Sep 2006 13:06:09 +0000] rev 1721
MERGE trunk -r534:537 -> branches/stable-1.1 (INSTALL file, Version info)

Fri, 01 Sep 2006 12:56:37 +0000MERGE trunk -r528:534 -> branches/stable-1.1 (master version in Doxyfile) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 01 Sep 2006 12:56:37 +0000] rev 1720
MERGE trunk -r528:534 -> branches/stable-1.1 (master version in Doxyfile)

Fri, 01 Sep 2006 12:35:41 +0000MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 01 Sep 2006 12:35:41 +0000] rev 1719
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)

Wed, 09 Aug 2006 15:14:29 +0000Changes extra version to "stable". stable-1.1
Florian Pose <fp@igh-essen.com> [Wed, 09 Aug 2006 15:14:29 +0000] rev 1718
Changes extra version to "stable".

Wed, 09 Aug 2006 15:04:07 +0000MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs) stable-1.1
Florian Pose <fp@igh-essen.com> [Wed, 09 Aug 2006 15:04:07 +0000] rev 1717
MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs)

Wed, 09 Aug 2006 14:38:44 +0000MERGE trunk -r494:513 -> branches/stable-1.1 (SDO configuration, bugfixes, EoE frame rates) stable-1.1
Florian Pose <fp@igh-essen.com> [Wed, 09 Aug 2006 14:38:44 +0000] rev 1716
MERGE trunk -r494:513 -> branches/stable-1.1 (SDO configuration, bugfixes, EoE frame rates)

Thu, 03 Aug 2006 12:59:01 +0000MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1) stable-1.1
Florian Pose <fp@igh-essen.com> [Thu, 03 Aug 2006 12:59:01 +0000] rev 1715
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)

Thu, 13 Jul 2006 13:10:57 +0000Created stable-1.1 branch for new interfaces. stable-1.1
Florian Pose <fp@igh-essen.com> [Thu, 13 Jul 2006 13:10:57 +0000] rev 1714
Created stable-1.1 branch for new interfaces.

Mon, 26 Jan 2009 12:04:49 +0000Removed todo line. 1.4-foe
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 12:04:49 +0000] rev 1713
Removed todo line.

Tue, 20 Jan 2009 10:49:59 +0000Fixed seg_size parameter when processing an CoE Upload Segment Response. 1.4-foe
Florian Pose <fp@igh-essen.com> [Tue, 20 Jan 2009 10:49:59 +0000] rev 1712
Fixed seg_size parameter when processing an CoE Upload Segment Response.

Tue, 20 Jan 2009 09:55:32 +0000Introduced configured_[tr]x_mailbox(size|offset) members of slave. 1.4-foe
Florian Pose <fp@igh-essen.com> [Tue, 20 Jan 2009 09:55:32 +0000] rev 1711
Introduced configured_[tr]x_mailbox(size|offset) members of slave.

Tue, 20 Jan 2009 08:04:50 +0000merge -c1617 branches/stable-1.4 1.4-foe
Florian Pose <fp@igh-essen.com> [Tue, 20 Jan 2009 08:04:50 +0000] rev 1710
merge -c1617 branches/stable-1.4