Rediffed patches for merge fuzz

2018-11-07 20:00:29 -06:00
parent 34394e7ee0
commit 11bb39ecf6
6 changed files with 39 additions and 40 deletions
--- a/patches/aeadtest.c.patch
+++ b/patches/aeadtest.c.patch
@@ -1,9 +1,9 @@
--- tests/aeadtest.c.orig	2016-10-18 17:03:33.845870889 +0900
-+++ tests/aeadtest.c	2016-10-18 17:11:19.880841283 +0900
+--- tests/aeadtest.c.orig	2018-07-24 21:59:17.000000000 -0500
+++ tests/aeadtest.c	2018-11-07 18:44:43.000000000 -0600
@@ -76,6 +76,12 @@
- 
+
 #define BUF_MAX 1024
- 
+
 +#ifdef _MSC_VER
 +#ifdef IN
 +#undef IN