diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-03 12:12:50 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-03 12:12:50 +1000 |
commit | 329638e49c00639d6616b58cda234ba2b3059022 (patch) | |
tree | 9b94f324c167827db854a98475a428346e65bbd6 /openbsd-compat/glob.h | |
parent | 4636d93c0c772e63ea1c97d40467569f8658e8aa (diff) |
- (djm) Sync openbsd-compat with OpenBSD CVS.
- No more 4-term BSD licenses in our tree
Diffstat (limited to 'openbsd-compat/glob.h')
-rw-r--r-- | openbsd-compat/glob.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index 6421f7049..aceddbc48 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp $ */ | 1 | /* $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */ |
2 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ | 2 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -16,11 +16,7 @@ | |||
16 | * 2. Redistributions in binary form must reproduce the above copyright | 16 | * 2. Redistributions in binary form must reproduce the above copyright |
17 | * notice, this list of conditions and the following disclaimer in the | 17 | * notice, this list of conditions and the following disclaimer in the |
18 | * documentation and/or other materials provided with the distribution. | 18 | * documentation and/or other materials provided with the distribution. |
19 | * 3. All advertising materials mentioning features or use of this software | 19 | * 3. Neither the name of the University nor the names of its contributors |
20 | * must display the following acknowledgement: | ||
21 | * This product includes software developed by the University of | ||
22 | * California, Berkeley and its contributors. | ||
23 | * 4. Neither the name of the University nor the names of its contributors | ||
24 | * may be used to endorse or promote products derived from this software | 20 | * may be used to endorse or promote products derived from this software |
25 | * without specific prior written permission. | 21 | * without specific prior written permission. |
26 | * | 22 | * |