diff options
author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:31:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:31:38 +1100 |
commit | 2f20de5e3f1c60eee3c9bda52289aff5c037dd08 (patch) | |
tree | 089896522c4130f1eadb66e658df22b538125122 /ChangeLog | |
parent | 58e2c5b3947122f82ecc0158180ba260e6e59166 (diff) |
- (djm) [regress/try-ciphers.sh] clean up CVS merge botch
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -55,6 +55,7 @@ | |||
55 | - djm@cvs.openbsd.org 2013/02/11 23:58:51 | 55 | - djm@cvs.openbsd.org 2013/02/11 23:58:51 |
56 | [regress/try-ciphers.sh] | 56 | [regress/try-ciphers.sh] |
57 | remove acss here too | 57 | remove acss here too |
58 | - (djm) [regress/try-ciphers.sh] clean up CVS merge botch | ||
58 | 59 | ||
59 | 20130211 | 60 | 20130211 |
60 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old | 61 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old |