[openrtm-commit:02097] r869 - in tags/RELEASE_1_1_2/OpenRTM-aist-Java: . jp.go.aist.rtm.RTC

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-11-01 15:04:14 +0900 (Tue, 01 Nov 2016)
New Revision: 869

Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist-Java/
   tags/RELEASE_1_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/
   tags/RELEASE_1_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
Log:
[merge] r868 has been merged from branches/RELENG_1_1.


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


Property changes on: tags/RELEASE_1_1_2/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,818
   + /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:868
/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

Modified: tags/RELEASE_1_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-11-01 06:01:09 UTC (rev 868)
+++ tags/RELEASE_1_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-11-01 06:04:14 UTC (rev 869)
@@ -330,7 +330,7 @@
 
                         docencoding="UTF-8"
 
-			author="true" doctitle="OpenRTM-aist Java" 
+			author="true" doctitle="OpenRTM-aist-Java ${version}" 
 
 			nodeprecated="false" nodeprecatedlist="false" 
                         noindex="false" nonavbar="false" notree="false" 
@@ -354,7 +354,7 @@
 
                         docencoding="UTF-8"
 
-			author="true" doctitle="OpenRTM-aist Java" 
+			author="true" doctitle="OpenRTM-aist-Java ${version}" 
 
 			nodeprecated="false" nodeprecatedlist="false" 
                         noindex="false" nonavbar="false" notree="false"