aboutsummaryrefslogtreecommitdiffstats
path: root/helpers/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'helpers/ChangeLog')
-rw-r--r--helpers/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/helpers/ChangeLog b/helpers/ChangeLog
index 5a3f2fe3..ba49ecbb 100644
--- a/helpers/ChangeLog
+++ b/helpers/ChangeLog
@@ -1,3 +1,12 @@
+<<<<<<< HEAD
+2015-04-29 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gende.c, genbin.awk: New files.
+
+2015-04-29 Arnold D. Robbins <arnold@skeeve.com>
+
+ * 4.1.2: Release tar ball made.
+
2015-04-09 Andrew J. Schorr <aschorr@telemetry-investments.com>
* testdfa.c (setup_pattern): Rationalize buffer size computations.