[openrtm-commit:01875] r2713 - in branches/RELENG_1_1/OpenRTM-aist: . win32/OpenRTM-aist/rtm/idl

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-01 11:18:02 +0900 (Fri, 01 Apr 2016)
New Revision: 2713

Added:
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/
Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am
Log:
[merge] r2711-2712 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,2706
   + /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,2711-2712

Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2016-03-31 10:03:42 UTC (rev 2712)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2016-04-01 02:18:02 UTC (rev 2713)
@@ -1697,6 +1697,7 @@
 	win32/OpenRTM-aist/coil/Makefile
 	win32/OpenRTM-aist/rtm/Makefile
 	win32/OpenRTM-aist/rtm/idl/Makefile
+	win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile
 	win32/OpenRTM-aist/installer/Makefile
 	win32/OpenRTM-aist/installer/Bitmaps/Makefile
 	])


Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678,2681
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678,2681,2711-2712

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am	2016-03-31 10:03:42 UTC (rev 2712)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/Makefile.am	2016-04-01 02:18:02 UTC (rev 2713)
@@ -4,6 +4,8 @@
 ##
 ## $Id$
 ##---------------------------------------------------------------------------
+SUBDIRS = device_interfaces .
+
 clean-local:
 	rm -rf Debug Release
 	rm -f *~ *.idl *.cpp *.h *.cc *.hh