[BACK]Return to LICENSE CVS log [TXT][DIR] Up to [local] / src / usr.bin / vi

Diff for /src/usr.bin/vi/LICENSE between version 1.2 and 1.3

version 1.2, 1996/07/28 11:29:16 version 1.3, 1996/08/20 22:55:39
Line 1 
Line 1 
 #       @(#)LICENSE     8.7 (Berkeley) 3/4/96  
   
 This work is copyrighted by The Regents of the University of California,  
 and by Keith Bostic.  It may be freely redistributed under the following  
 conditions, until one year after the release of any subsequent version of  
 this software, at which point it may no longer be redistributed without  
 written permission from Keith Bostic.  
   
 /*-  /*-
    * Copyright (c) 1991, 1992, 1993, 1994
    *      The Regents of the University of California.  All rights reserved.
    *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
Line 34 
Line 29 
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.   * SUCH DAMAGE.
    */
   
   /*
    * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
    *      Keith Bostic.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following message.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following message in the
    *    documentation and/or other materials provided with the distribution.
    * 3. For permission to redistribute this program under conditions other
    *    than these, contact Keith Bostic.
    *
    * The vi program is shareware.  You are welcome to copy, modify and share
    * it with others under the conditions listed in the LICENSE file.  If your
    * company finds vi sufficiently useful that you would have purchased it,
    * or your company wishes to redistribute it, contributions to the authors
    * would be appreciated.
  */   */
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3