diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-04-23 20:39:01 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-04-23 20:39:01 +0000 |
| commit | e75ab05ae705cdd8919929a6c26af36867ca408a (patch) | |
| tree | 380a44a6154732438b7ee34e761f6398f1302a79 /usr.sbin/sysmerge | |
| parent | ed4a38ec44de030399a080124260dc623109aea7 (diff) | |
- clarify copyright / license
discussed with deraadt@ millert@
wording from millert@
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 254f9c71d8b..fa2054807bc 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,13 +1,14 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.3 2008/04/23 16:50:33 deraadt Exp $ +# $OpenBSD: sysmerge.sh,v 1.4 2008/04/23 20:39:00 ajacoutot Exp $ # -# This script is based on the FreeBSD mergemaster script which is -# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> +# This script is based on the FreeBSD mergemaster script, written by +# Douglas Barton <DougB@FreeBSD.org> # # Some ideas came from the NetBSD etcupdate script, written by # Martti Kuparinen <martti@NetBSD.org> # +# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> # # Permission to use, copy, modify, and distribute this software for any |