summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-07-21 16:21:13 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-07-21 16:21:13 +0000
commita597a81e08feaf5b79b3d5ff2844a63ce31aaddb (patch)
treec51eb6bd691b738ff896277ff82e0823d01f0651 /usr.bin
parent4cc7bc06869ff8a38d3856d17278fd2621409571 (diff)
Updated license from nvi-1.81.5 since we will be pulling in patches from it.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/vi/LICENSE11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/vi/LICENSE b/usr.bin/vi/LICENSE
index bb34822f403..7f4df86b30d 100644
--- a/usr.bin/vi/LICENSE
+++ b/usr.bin/vi/LICENSE
@@ -1,12 +1,15 @@
-Copyright (c) 1996, 1997
- Sleepycat Software. All rights reserved.
+/* $OpenBSD: LICENSE,v 1.10 2003/07/21 16:21:12 millert Exp $ */
-Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
- Keith Bostic. All rights reserved.
+The following are the copyrights and redistribution conditions that apply
+to this copy of the Vi software.
/*
* Copyright (c) 1991, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+ * Keith Bostic. All rights reserved.
+ * Copyright (c) 1999, 2000
+ * Sven Verdoolaege. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions