[openrtm-commit:00271] r2210 - branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-07-27 23:07:51 +0900 (Wed, 27 Jul 2011)
New Revision: 2210

Modified:
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
Log:
Conflict message has been removed.

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-07-27 14:02:57 UTC (rev 2209)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-07-27 14:07:51 UTC (rev 2210)
@@ -20,11 +20,7 @@
 @rem   RTSE should be under the following OMNI_ROOT directory.
 @rem ------------------------------------------------------------
 @set RTM_ROOT=%~dp0
-<<<<<<< .working
- at set PATH="C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
-=======
 @set PATH="C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
->>>>>>> .merge-right.r2208
 @set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc10
 @set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
 @set VC_VERSION=Visual C++ 2010