| commit | 37834afe7be91de1aff4bdffbef2c54797ec58d6 | [log] [tgz] |
|---|---|---|
| author | Damien Miller <djm@mindrot.org> | Wed Dec 12 11:00:37 2012 +1100 |
| committer | Damien Miller <djm@mindrot.org> | Wed Dec 12 11:00:37 2012 +1100 |
| tree | ac7eb2c1689d8b3ab35d3dcba216194754ff75f6 | |
| parent | ec7ce9ace470aad20aeea0769ddc998dea307830 [diff] [blame] |
- (djm) [mac.c] fix merge botch
diff --git a/ChangeLog b/ChangeLog index 05a3b07..ed58d1c 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -24,6 +24,7 @@ - markus@cvs.openbsd.org 2012/12/11 23:12:13 [try-ciphers.sh] add hmac-ripemd160-etm@openssh.com + - (djm) [mac.c] fix merge botch 20121207 - (dtucker) OpenBSD CVS Sync