summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-07 17:07:15 +1100
committerDamien Miller <djm@mindrot.org>2013-12-07 17:07:15 +1100
commiteb401585bb8336cbf81fe4fc58eb9f7cac3ab874 (patch)
tree639bcc0951e2d3aa00878a2f6f3e2449b78fb7c2 /ChangeLog
parentf54542af3ad07532188b10136ae302314ec69ed6 (diff)
- (djm) [regress/cert-hostkey.sh] Fix merge botch
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5edeb82b2..317dd2c46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
48 - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in] 48 - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]
49 [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on 49 [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
50 Linux 50 Linux
51 - (djm) [regress/cert-hostkey.sh] Fix merge botch
51 52
5220131205 5320131205
53 - (djm) OpenBSD CVS Sync 54 - (djm) OpenBSD CVS Sync