about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-10-29 08:49:33 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-10-29 08:49:33 -0700
commit9d2cfa7af6b8973e13716f7c36f7fb156e3348dd (patch)
treec3eb8ee16917b822f908f37653796f4aa31b5648 /ChangeLog
parentd36421d3769c964e6edfb700f03ef48cbe7af4e9 (diff)
parent16cfa78aa98da19f5928dd6bd036705096017815 (diff)
downloadzsh-9d2cfa7af6b8973e13716f7c36f7fb156e3348dd.tar.gz
zsh-9d2cfa7af6b8973e13716f7c36f7fb156e3348dd.tar.xz
zsh-9d2cfa7af6b8973e13716f7c36f7fb156e3348dd.zip
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts:
	ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f574e6617..284029883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,17 @@
 	in output loops so that unexpectedly long completion listings can
 	be interrupted
 
+2014-10-29  Oliver Kiddle  <opk@zsh.org>
+
+	* 33528: Src/Zle/iwidgets.list, Src/Zle/zle_vi.c,
+	Test/X02zlevi.ztst: take notice of last column position when
+	using vi-yank and an upward cursor movement
+
+2014-10-27  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 33561, 33562: Src/jobs.c: The time builtin forgot to unmetafy
+	TIMEFMT.
+
 2014-10-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 33564: Test/A05execution.ztst: more care with monitor option.