diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2014-06-16 18:33:34 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2014-06-16 18:33:34 +0000 |
| commit | 4e18d1dc67159753ae3de40743c0639e2b815fbb (patch) | |
| tree | 8113411aa7012e8ddd7e403b8d75be1596b8b69a /sbin/fsck_msdos/ext.h | |
| parent | 8a7a26bd77d3ab1d8bf5bf1faea13c3260e8dc76 (diff) | |
Merge NetBSD commit:
Move to 2 clause license, approved by Wolfgang Solfrank.
ok deraadt@, krw@
Diffstat (limited to 'sbin/fsck_msdos/ext.h')
| -rw-r--r-- | sbin/fsck_msdos/ext.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sbin/fsck_msdos/ext.h b/sbin/fsck_msdos/ext.h index 5d5dd16516f..72dc8804977 100644 --- a/sbin/fsck_msdos/ext.h +++ b/sbin/fsck_msdos/ext.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext.h,v 1.10 2012/03/31 17:53:34 krw Exp $ */ +/* $OpenBSD: ext.h,v 1.11 2014/06/16 18:33:33 tobias Exp $ */ /* $NetBSD: ext.h,v 1.5 1997/10/17 11:19:48 ws Exp $ */ /* @@ -13,13 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Martin Husemann - * and Wolfgang Solfrank. - * 4. 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 BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |