[openrtm-commit:01329] r2521 - in tags/RELEASE_1_1_0/OpenRTM-aist: . utils/rtm-skelwrapper

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-03 16:47:45 +0900 (Mon, 03 Mar 2014)
New Revision: 2521

Modified:
   tags/RELEASE_1_1_0/OpenRTM-aist/
   tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py
Log:
[merge] r2520 has been mereged.


Property changes on: tags/RELEASE_1_1_0/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2371
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2512-2513,2515-2516
   + /branches/RELENG_1_1/OpenRTM-aist:2371,2520
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2512-2513,2515-2516

Modified: tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py
===================================================================
--- tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py	2014-03-03 07:45:49 UTC (rev 2520)
+++ tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py	2014-03-03 07:47:45 UTC (rev 2521)
@@ -86,7 +86,7 @@
  *
  */
 
-#include "[include_dir][skel_h]"
+#include "[skel_h]"
 
 #if defined ORB_IS_TAO
 #  include "[include_dir][basename]C.cpp"
@@ -175,7 +175,7 @@
  *
  */
 
-#include "[include_dir][stub_h]"
+#include "[stub_h]"
 
 #if   defined ORB_IS_TAO
 #  include "[include_dir][basename]C.cpp"