avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: avalon/merlin/platform/src/bin/nt TANUKISOFTWARE_LICENSE.txt
Date Thu, 18 Mar 2004 02:08:30 GMT
leif        2004/03/17 18:08:30

  Modified:    merlin/platform/src/bin/nt TANUKISOFTWARE_LICENSE.txt
  Log:
  Update the Java Service Wrapper License.
  
  Revision  Changes    Path
  1.2       +27 -9     avalon/merlin/platform/src/bin/nt/TANUKISOFTWARE_LICENSE.txt
  
  Index: TANUKISOFTWARE_LICENSE.txt
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/TANUKISOFTWARE_LICENSE.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TANUKISOFTWARE_LICENSE.txt	24 Sep 2003 09:33:24 -0000	1.1
  +++ TANUKISOFTWARE_LICENSE.txt	18 Mar 2004 02:08:29 -0000	1.2
  @@ -1,13 +1,13 @@
  -Copyright (c) 1999, 2003 TanukiSoftware.org
  +Copyright (c) 1999, 2004 Tanuki Software
   
   Permission is hereby granted, free of charge, to any person
  -obtaining a copy of this software and associated documentation
  -files (the "Software"), to deal in the Software without 
  -restriction, including without limitation the rights to use, 
  -copy, modify, merge, publish, distribute, sublicense, and/or 
  -sell copies of the Software, and to permit persons to whom the
  -Software is furnished to do so, subject to the following 
  -conditions:
  +obtaining a copy of the Java Service Wrapper and associated
  +documentation files (the "Software"), to deal in the Software
  +without  restriction, including without limitation the rights
  +to use, copy, modify, merge, publish, distribute, sub-license,
  +and/or sell copies of the Software, and to permit persons to
  +whom the Software is furnished to do so, subject to the
  +following conditions:
   
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of the Software.
  @@ -15,9 +15,27 @@
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
  -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
  +NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
  +
  +
  +Portions of the Software have been derived from source code
  +developed by Silver Egg Technology under the following license:
  +
  +Copyright (c) 2001 Silver Egg Technology
  +
  +Permission is hereby granted, free of charge, to any person
  +obtaining a copy of this software and associated documentation
  +files (the "Software"), to deal in the Software without 
  +restriction, including without limitation the rights to use, 
  +copy, modify, merge, publish, distribute, sub-license, and/or 
  +sell copies of the Software, and to permit persons to whom the
  +Software is furnished to do so, subject to the following 
  +conditions:
  +
  +The above copyright notice and this permission notice shall be
  +included in all copies or substantial portions of the Software.
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message