[openrtm-commit:01928] r819 - in branches/RELENG_1_1/OpenRTM-aist-Java: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/bin

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-06 13:32:02 +0900 (Fri, 06 May 2016)
New Revision: 819

Removed:
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bin/RTC/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bin/RTMExamples/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bin/_SDOPackage/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bin/jp/
Modified:
   branches/RELENG_1_1/OpenRTM-aist-Java/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/
Log:
[merge] r818 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Java
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/OpenRTM-aist-Java:815
   + /trunk/OpenRTM-aist-Java:815,818


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:815
   + /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:815,818