Revision 3112
Added by n-ando over 5 years ago
Files
- added
- modified
- copied
- renamed
- deleted
- trunk
- OpenRTM-aist
- configure.ac (diff)
- src
- ext
- sdo
- Makefile.am (diff)
- extended_fsm /branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm
- fsm4rtc_observer /branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer
- sdo
- lib
- ext
- OpenRTM-aist
merged changes from branches/FSM4RTC/OpenRTM-aist r2761, sdo/Makefile.am confliction resolved:
[FSM4RTC,incompat,->RELENG_2_0] FSM4RTC ComponentObservice initial implementation has been added. refs #3591
[FSM4RTC,incompat,->RELENG_2_0] FSM4RTC ExtendedFsmService initial implementation has been added. refs #3593