[openrtm-commit:01091] r445 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python
openrtm @ openrtm.org
openrtm @ openrtm.org
2013年 5月 17日 (金) 09:55:40 JST
Author: n-ando
Date: 2013-05-17 09:55:39 +0900 (Fri, 17 May 2013)
New Revision: 445
Modified:
branches/RELENG_1_1/rtmtools/
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
Log:
[merged-trunk] r444 merged.
Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417,419,421-428,433-434,442
+ /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417,419,421-428,433-434,442,444
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl 2013-05-16 15:21:36 UTC (rev 444)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl 2013-05-17 00:55:39 UTC (rev 445)
@@ -310,7 +310,7 @@
#if(${rtcParam.getDocActionPostCondition(1).length()}>0) #if(${rtcParam.IsNotImplemented(1)})${sharp}#end ${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(1)})}
#end
#if(${rtcParam.IsNotImplemented(1)})${sharp}#end ${sharp}
- #if(${rtcParam.IsNotImplemented(1)})${sharp}#end${def} onFinalize(self, ec_id):
+ #if(${rtcParam.IsNotImplemented(1)})${sharp}#end${def} onFinalize(self):
#if(${rtcParam.IsNotImplemented(1)})${sharp}#end
#if(${tmpltHelper.checkDetailContent(1,${rtcParam})}) ${rtcParam.getDetailContent(1)}
#end
More information about the openrtm-commit
mailing list