diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2018-01-08 15:15:36 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-01-23 16:30:39 +1100 |
| commit | ec4a9831184c0c6ed5f7f0cfff01ede5455465a3 (patch) | |
| tree | 64492d554bb27aad2503fe6719605d0a9941122e | |
| parent | ec77efeea06ac62ee1d76fe0b3225f3000775a9e (diff) | |
upstream commit
split client/server kex; only ssh-keygen needs
uuencode.o; only scp/sftp use progressmeter.o; ok djm@
OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee
| -rw-r--r-- | .skipped-commit-ids | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.skipped-commit-ids b/.skipped-commit-ids index a73c3bf23..836511bb3 100644 --- a/.skipped-commit-ids +++ b/.skipped-commit-ids | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | 5317f294d63a876bfc861e19773b1575f96f027d remove libssh from makefiles | 1 | 5317f294d63a876bfc861e19773b1575f96f027d remove libssh from makefiles |
| 2 | a337e886a49f96701ccbc4832bed086a68abfa85 Makefile changes | 2 | a337e886a49f96701ccbc4832bed086a68abfa85 Makefile changes |
| 3 | f2c9feb26963615c4fece921906cf72e248b61ee more Makefile | ||
| 3 | 4 | ||
| 4 | Old upstream tree: | 5 | Old upstream tree: |
| 5 | 6 | ||