- jmc@cvs.openbsd.org 2010/01/13 12:48:34

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 00cb316b273c94ae11e1586c770ca81dbae156c1..088af5f264a1b9bef77d00145adc858160f820cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+20100115
+ - (dtucker) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2010/01/13 12:48:34
+     [sftp.1 sftp.c]
+     sftp.1: put ls -h in the right place
+     sftp.c: as above, plus add -p to get/put, and shorten their arg names
+     to keep the help usage nicely aligned
+     ok djm
+
+20100114
+ - (djm) [platform.h] Add missing prototype for
+   platform_krb5_get_principal_name
+
 20100113
  - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs.
  - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:
@@ -30,6 +43,9 @@
      [sftp.c]
      don't append a space after inserting a completion of a directory (i.e.
      a path ending in '/') for a slightly better user experience; ok dtucker@
+ - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
+ - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG. 
+   feedback and ok dtucker@
 
 20100112
  - (dtucker) OpenBSD CVS Sync