about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fd89cc28..39599afd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-06  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 34114: Src/builtin.c: emulate: Handle aborting from mixed
+	-L/-c correctly
+
 2015-01-06  Barton E. Schaefer  <schaefer@zsh.org>
 
         * 34103: Src/subst.c: fix ancient (workers/15872) thinko that