summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorVern Paxson <vern@ee.lbl.gov>1997-06-27 19:36:51 +0000
committerVern Paxson <vern@ee.lbl.gov>1997-06-27 19:36:51 +0000
commit976a9a16452d22ba2c79fa7806941ba1c1e771a2 (patch)
tree247085acfe2d92ed3e6839128d9ee9d89b0f4df8 /COPYING
parent79b29cceaee79c86bed3f2aae301e036ab13d5e4 (diff)
revised for rms
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING21
1 files changed, 10 insertions, 11 deletions
diff --git a/COPYING b/COPYING
index dcb775e..62e1663 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@ Flex carries the copyright used for BSD software, slightly modified
because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
which operates under a contract with the Department of Energy:
- Copyright (c) 1990 The Regents of the University of California.
+ Copyright (c) 1990, 1997 The Regents of the University of California.
All rights reserved.
This code is derived from software contributed to Berkeley by
@@ -12,16 +12,15 @@ which operates under a contract with the Department of Energy:
to contract no. DE-AC03-76SF00098 between the United States
Department of Energy and the University of California.
- Redistribution and use in source and binary forms are permitted
- provided that: (1) source distributions retain this entire
- copyright notice and comment, and (2) distributions including
- binaries display the following acknowledgement: ``This product
- includes software developed by the University of California,
- Berkeley and its contributors'' in the documentation or other
- materials provided with the distribution and in all advertising
- materials mentioning features or use of this software. Neither the
- name of the University nor the names of its contributors may be
- used to endorse or promote products derived from this software
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that: (1) source
+ distributions retain this entire copyright notice and comment,
+ and (2) distributions including binaries display the following
+ acknowledgement: ``This product includes software developed by the
+ University of California, Berkeley and its contributors'' in the
+ documentation or other materials provided with the distribution.
+ Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR