summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f6412fb3..2864e1623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) 2 - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
3 that got lost in recent merge. 3 that got lost in recent merge.
4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff 4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
5 - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
5 6
620131104 720131104
7 - (djm) OpenBSD CVS Sync 8 - (djm) OpenBSD CVS Sync