diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-07 07:21:21 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-07 07:21:21 -0700 |
| commit | 141089231c9731811939d6ce24888fc95693eb6e (patch) | |
| tree | 376d6a022648790ae06fec23c1c2877e6fa9b1b7 /ChangeLog | |
| parent | 2be3ff58e234456348765e435ef3185ff9d43a1c (diff) | |
| parent | 08d4a6136e5c289d1be6d6290568866c2d59ef53 (diff) | |
| download | zsh-141089231c9731811939d6ce24888fc95693eb6e.tar.gz zsh-141089231c9731811939d6ce24888fc95693eb6e.tar.xz zsh-141089231c9731811939d6ce24888fc95693eb6e.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 35a3d203e..cbecd574a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-04-07 Peter Stephenson <p.stephenson@samsung.com> + + * 32527: Doc/Zsh/contrib.yo, Functions/Misc/zcalc, + Functions/Zle/zcalc-auto-insert: zcalc-auto-insert widget + for key binding in zcalc. + 2014-04-06 Barton E. Schaefer <schaefer@zsh.org> * unposted: Doc/Zsh/options.yo: fix typo in option cross-reference |