[openrtm-commit:01877] r701 - trunk/OpenRTM-aist-Python

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-01 17:34:08 +0900 (Fri, 01 Apr 2016)
New Revision: 701

Modified:
   trunk/OpenRTM-aist-Python/
Log:
[merge] r663 has been merged from branches/RELENG_1_1.


Property changes on: trunk/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497,654
/branches/work/OpenRTM-aist-Python:504-542
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497,654,663
/branches/work/OpenRTM-aist-Python:504-542