[openrtm-commit:02136] r753 - tags/RELEASE_1_1_2/OpenRTM-aist-Python

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-11-24 13:37:00 +0900 (Thu, 24 Nov 2016)
New Revision: 753

Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist-Python/
   tags/RELEASE_1_1_2/OpenRTM-aist-Python/MANIFEST.in
Log:
[merge] r752 has been merged from branches/RELENG_1_1.


Property changes on: tags/RELEASE_1_1_2/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,715,730
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662,702,705-707,709-714,729
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497,715,730,752
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662,702,705-707,709-714,729,751

Modified: tags/RELEASE_1_1_2/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist-Python/MANIFEST.in	2016-11-24 04:33:51 UTC (rev 752)
+++ tags/RELEASE_1_1_2/OpenRTM-aist-Python/MANIFEST.in	2016-11-24 04:37:00 UTC (rev 753)
@@ -9,5 +9,5 @@
 recursive-include installer *.rtf *.in *.wxs *.vbs *.bmp *.txt *.sh *.wxl *.cmd *.py *.bat
 recursive-include OpenRTM_aist *.conf *.exe *.idl *.py *.pth *.sh
 recursive-include OpenRTM_aist *.bat *.exe *.sample README
-recursive-include OpenRTM_aist/docs *.css *.gif *.png *.html *.hhc *.hhk *.hhp
-prune OpenRTM_aist/examples/NXTRTC
\ No newline at end of file
+recursive-include OpenRTM_aist/docs *.css *.gif *.png *.html *.hhc *.hhk *.hhp Doxyfile_en.in Doxyfile_jp.in
+prune OpenRTM_aist/examples/NXTRTC