[openrtm-commit:03346] r1034 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

2018年 10月 10日 (水) 15:05:56 JST

Author: miyamoto
Date: 2018-10-10 15:05:56 +0900 (Wed, 10 Oct 2018)
New Revision: 1034

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
Log:
[merge] r1033 has been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================

--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2018-10-10 06:04:28 UTC (rev 1033)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2018-10-10 06:05:56 UTC (rev 1034)
@@ -4707,7 +4707,7 @@
                        "transition_timeout",
                        "activation_timeout",
                        "deactivation_timeout",
-                       "reset_timeout"
+                       "reset_timeout",
                        "cpu_affinity"]
 
     p_ = self._properties.findNode("exec_cxt")

