[openrtm-commit:01719] r2707 - in branches/RELENG_1_1/OpenRTM-aist: . win32/OpenRTM-aist/bin

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-02-18 16:28:21 +0900 (Thu, 18 Feb 2016)
New Revision: 2707

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
Log:
[merge] r2706 have been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-18 07:03:32 UTC (rev 2706)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-18 07:28:21 UTC (rev 2707)
@@ -4,7 +4,8 @@
 set orb="omniORB"
 set port=%1
 rem set OMNIORB_USEHOSTNAME=localhost
-set PATH=%PATH%;%OMNI_ROOT%\bin\x86_win32
+call set omni_root=%OMNI_ROOT%
+set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
 
 if NOT DEFINED port set port=2809