From efa1c950921659a0f10b9adf30625fba21b3815c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 12 Jan 2013 23:10:47 +1100 Subject: - (djm) [regress/integrity.sh] repair botched merge --- ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index dd847610f..92830553e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ - djm@cvs.openbsd.org 2013/01/12 11:23:53 [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh] test AES-GCM modes; feedback markus@ + - (djm) [regress/integrity.sh] repair botched merge 20130109 - (djm) OpenBSD CVS Sync -- cgit v1.2.3