17 Commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	62efe23a82	Resolve conflicts.	2006-11-10 16:52:41 +00:00
Dag-Erling Smørgrav	7705c58f36	Go figure how an extra $Id$ line crept in...	2006-10-04 10:21:00 +00:00
Dag-Erling Smørgrav	27241b599f	Merge vendor patch.	2006-10-04 10:15:53 +00:00
Dag-Erling Smørgrav	333ee03933	Merge conflicts. ... MFC after: 1 week	2006-09-30 13:38:06 +00:00
Dag-Erling Smørgrav	b74df5b26f	Merge conflicts.	2006-03-22 20:41:37 +00:00
Dag-Erling Smørgrav	d4ecd10857	Resolve conflicts.	2005-09-03 07:04:25 +00:00
Dag-Erling Smørgrav	aa49c9264c	Resolve conflicts.	2005-06-05 15:46:09 +00:00
Dag-Erling Smørgrav	21e764df0c	Resolve conflicts	2004-10-28 16:11:31 +00:00
Dag-Erling Smørgrav	5962c0e9a3	Resolve conflicts.	2004-04-20 09:46:41 +00:00
Dag-Erling Smørgrav	1ec0d75429	Resolve conflicts.	2004-02-26 10:52:33 +00:00
Dag-Erling Smørgrav	cf2b5f3b6d	Resolve conflicts and remove obsolete files. ... Sponsored by: registrar.no	2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav	e73e9afa91	Resolve conflicts.	2003-04-23 17:13:13 +00:00
Dag-Erling Smørgrav	f388f5ef26	Resolve conflicts.	2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav	076b29c735	<sys/mman.h> requires <sys/types.h>.	2002-06-29 11:57:51 +00:00
Dag-Erling Smørgrav	a82e551f0f	Resolve conflicts. ... Sponsored by: DARPA, NAI Labs	2002-06-29 11:48:59 +00:00
Dag-Erling Smørgrav	edb557f8bb	Support OPIE as an alternative to S/Key. ... Sponsored by: DARPA, NAI Labs	2002-06-29 10:44:37 +00:00
Dag-Erling Smørgrav	83d2307d00	Vendor import of OpenSSH 3.3p1.	2002-06-27 22:31:32 +00:00