From 2f20de5e3f1c60eee3c9bda52289aff5c037dd08 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 12 Feb 2013 11:31:38 +1100 Subject: - (djm) [regress/try-ciphers.sh] clean up CVS merge botch --- ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e744747e3..567bdf290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ - djm@cvs.openbsd.org 2013/02/11 23:58:51 [regress/try-ciphers.sh] remove acss here too + - (djm) [regress/try-ciphers.sh] clean up CVS merge botch 20130211 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old -- cgit v1.2.3