about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2013-05-21 16:15:29 +0100
committerPeter Stephenson <pws@zsh.org>2013-05-21 16:15:29 +0100
commit17d38259f871d28ce92a36c7fa3dff0f269dee04 (patch)
treecaa3e74e820e257e5bc387361ccc40fac5564929 /ChangeLog
parent2989e4b66e5efc9a756f59a738f9de32bb4d62cf (diff)
parent1182a75e1b4d46a42935a217e80a2955b76be1a5 (diff)
downloadzsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.tar.gz
zsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.tar.xz
zsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.zip
Fix merge
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a32773e4..4ce49d11b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-2013-05-21  Peter Stephenson  <p.stephenson@samsung.com>
+2013-05-20  Barton Schaefer  <schaefer@zsh.org>
 
-	* Stephane: 31417: Functions/Calendar/age: needs --
-	to protect againts files starting with -.
+	* 31416: Src/builtin.c: upon "read" of a short line, assign all
+	variables passed as arguments.
 
 2013-05-14  Peter Stephenson  <p.stephenson@samsung.com>