des
|
88c7c9558b
|
Resolve conflicts.
|
2005-09-03 07:04:25 +00:00 |
|
des
|
983ad11a1c
|
Resolve conflicts.
|
2005-06-05 15:46:09 +00:00 |
|
des
|
124c4a1415
|
Resolve conflicts.
|
2004-02-26 10:52:33 +00:00 |
|
des
|
7545fb1c7e
|
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
|
2004-01-07 11:16:27 +00:00 |
|
des
|
8a5b06b8e0
|
Remove RCSID from files which have no other diffs to the vendor branch.
|
2003-05-01 15:05:43 +00:00 |
|
des
|
279b0fa809
|
Resolve conflicts.
|
2002-10-29 10:16:02 +00:00 |
|
des
|
5ba29faa04
|
Forcibly revert to mainline.
|
2002-06-27 22:42: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 |
|
kris
|
24372e6c10
|
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
|
2000-09-10 09:35:38 +00:00 |
|
kris
|
a632b4789c
|
Resolve conflicts and update for FreeBSD.
|
2000-05-15 05:24:25 +00:00 |
|
kris
|
9b205c3441
|
#include <ssl/foo.h> -> #include <openssl/foo.h>
|
2000-03-26 10:00:28 +00:00 |
|
kris
|
b201b15ee1
|
Virgin import of OpenSSH sources dated 2000/03/25
|
2000-03-26 07:07:24 +00:00 |
|
markm
|
fc557ff7d9
|
Vendor import of OpenSSH.
|
2000-02-24 14:29:47 +00:00 |
|