[openrtm-commit:00440] r579 - trunk/jp.go.aist.rtm.RTC/installer/win32

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-10-04 10:27:46 +0900 (Tue, 04 Oct 2011)
New Revision: 579

Modified:
   trunk/jp.go.aist.rtm.RTC/installer/win32/License.rtf
   trunk/jp.go.aist.rtm.RTC/installer/win32/License.txt
Log:
License has been modified.

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/License.rtf
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/License.rtf	2011-10-04 00:49:45 UTC (rev 578)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/License.rtf	2011-10-04 01:27:46 UTC (rev 579)
@@ -67,7 +67,7 @@
 {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
 {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4468361 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 
 \fs24\lang1033\langfe1033\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\lang1033\langfe1041\langfenp1041\insrsid4468361\charrsid4468361 
-\par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\insrsid4468361\charrsid4468361 \hich\af0\dbch\af31505\loch\f0 Copyright (C) 2003-2010
+\par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\insrsid4468361\charrsid4468361 \hich\af0\dbch\af31505\loch\f0 Copyright (C) 2003-2011
 \par \hich\af0\dbch\af31505\loch\f0      Noriaki Ando and the OpenRTM-aist Project team
 \par \hich\af0\dbch\af31505\loch\f0      Intelligent Systems Research Institute,
 \par \hich\af0\dbch\af31505\loch\f0      National Institute of Advanced Industrial Science and Technology (AIST),
@@ -89,15 +89,12 @@
 \par 
 \par \hich\af0\dbch\af31505\loch\f0 LICENSE
 \par -------
-\par \hich\af0\dbch\af31505\loch\f0 The OpenRTM-aist is the dual-licensed open source software. You can}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\lang1033\langfe1041\langfenp1041\insrsid8144500 \hich\af0\dbch\af31505\loch\f0  }{\rtlch\fcs1 \af0\afs20 
+\par \hich\af0\dbch\af31505\loch\f0 The OpenRTM-aist (H22PRO-1164) is the dual-licensed open source software. You can}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\lang1033\langfe1041\langfenp1041\insrsid8144500 \hich\af0\dbch\af31505\loch\f0  }{\rtlch\fcs1 \af0\afs20 
 \ltrch\fcs0 \fs18\insrsid4468361\charrsid4468361 \hich\af0\dbch\af31505\loch\f0 use, copy, distribute and/or modify this library under the terms and}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\lang1033\langfe1041\langfenp1041\insrsid8144500 
 \hich\af0\dbch\af31505\loch\f0  }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs18\insrsid4468361\charrsid4468361 \hich\af0\dbch\af31505\loch\f0 conditions of either of the licenses below.
 \par 
-\par \hich\af0\dbch\af31505\loch\f0 1) EPL (Eclipse Public License - v 1.0)
+\par \hich\af0\dbch\af31505\loch\f0 1) LGPL (GNU LESSER GENERA PUBLIC LICENSE)
 \par \hich\af0\dbch\af31505\loch\f0 See
-\par \hich\af0\dbch\af31505\loch\f0 http://www.eclipse.org/legal/epl-v10.html
-\par \hich\af0\dbch\af31505\loch\f0 http://www.eclipse.org/org/documents/epl-v10.php
-\par \hich\af0\dbch\af31505\loch\f0 or
 \par \hich\af0\dbch\af31505\loch\f0 COPY\hich\af0\dbch\af31505\loch\f0 ING.LIB.
 \par 
 \par \hich\af0\dbch\af31505\loch\f0 2) Individual Licnese
@@ -267,4 +264,4 @@
 46196496ca01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file
+0000000000000000000000000000000000000000000000000105000000000000}}

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/License.txt
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/License.txt	2011-10-04 00:49:45 UTC (rev 578)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/License.txt	2011-10-04 01:27:46 UTC (rev 579)
@@ -1,4 +1,4 @@
-Copyright (C) 2003-2010
+Copyright (C) 2003-2011
      Noriaki Ando and the OpenRTM-aist Project team
      Intelligent Systems Research Institute,
      National Institute of Advanced Industrial Science and Technology (AIST),
@@ -12,14 +12,10 @@
 
 LICENSE
 -------
-The OpenRTM-aist is the dual-licensed open source software. You can use, copy, distribute and/or modify this library under the terms and conditions of either of the licenses below.
+The OpenRTM-aist (H22PRO-1164) is the dual-licensed open source software. You can use, copy, distribute and/or modify this library under the terms and conditions of either of the licenses below.
 
-1) EPL (Eclipse Public License - v 1.0)
-See
-http://www.eclipse.org/legal/epl-v10.html
-http://www.eclipse.org/org/documents/epl-v10.php
-or
-COPYING.LIB.
+1) LGPL (GNU LESSER GENERAL PUBLIC LICENSE)
+See COPYING.LIB.
 
 2) Individual Licnese
 You can purchase license from AIST and/or AIST's TLO to copy, distribute, modify and/or sublicense the library without any limitation in the terms of LGPL. The individual license should be concluded with a negotiated agreement between you and AIST and/or AIST TLO. To conclude individual license, contact the person responsible of AIST.