diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2008-04-23 20:39:00 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2008-04-23 20:39:00 +0000 |
| commit | 8d3ec1cf79ceca6379ddf8c9b3fe9abd40bc64e9 (patch) | |
| tree | 5ebcf50c795c04ce849e17882ec801980e6ce80f | |
| parent | document sysmerge(8); (diff) | |
| download | wireguard-openbsd-8d3ec1cf79ceca6379ddf8c9b3fe9abd40bc64e9.tar.xz wireguard-openbsd-8d3ec1cf79ceca6379ddf8c9b3fe9abd40bc64e9.zip | |
- clarify copyright / license
discussed with deraadt@ millert@
wording from millert@
| -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 |