10 Commits

Author	SHA1	Message	Date
des	91a576f9b7	s/X11R6/local/g	2007-05-24 22:04:07 +00:00
des	4ff234ef46	Merge conflicts. ... MFC after: 1 week	2006-09-30 13:38:06 +00:00
des	a744ec13ad	Resolve conflicts	2004-10-28 16:11:31 +00:00
des	124c4a1415	Resolve conflicts.	2004-02-26 10:52:33 +00:00
des	5ba29faa04	Forcibly revert to mainline.	2002-06-27 22:42:11 +00:00
des	fa8aa6dfe7	Resolve conflicts. Known issues: ... - sshd fails to set TERM correctly. - privilege separation may break PAM and is currently turned off. - man pages have not yet been updated I will have these issues resolved, and privilege separation turned on by default, in time for DP2. Sponsored by: DARPA, NAI Labs	2002-06-23 16:09:08 +00:00
jedgar	a679ebf88a	Remove _PATH_CP now that it is defined in paths.h ... Reviewed by: des	2002-05-12 01:52:11 +00:00
des	6534271ec8	Fix conflicts.	2002-03-18 10:09:43 +00:00
green	119a11eb6b	Fix conflicts for OpenSSH 2.9.	2001-05-04 04:14:23 +00:00
green	8acd87ac47	Say "hi" to the latest in the OpenSSH series, version 2.9! ... Happy birthday to: rwatson	2001-05-04 03:57:05 +00:00