diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
| commit | 6336347c9e02ebae565b2d62987d1052bcba5567 (patch) | |
| tree | c57790ed50fa12ab04733286bd10990d59fb13d0 /ChangeLog | |
| parent | 2ba4aa275e548ae9d4406e3bc8008bdfa1ce29eb (diff) | |
| parent | 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (diff) | |
| download | zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.gz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.xz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.zip | |
fix my own merge conflict with grammar changes
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 46f390f67..757ceaf57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,43 @@ * Jun T: 32755: Doc/Zsh/grammar.yo: move line that was in the wrong place. +2014-06-07 Barton E. Schaefer <schaefer@zsh.org> + + * Nikolas Garofil: 32737: Src/utils.c: properly ifdef declarations + + * Nikolas Garofil: 32736 (tweak per 32741): Src/zsh_system.h: + memmove() should return its dest argument + + * Nikolas Garofil: 32735: Src/signals.c: define ret before use + + * Nikolas Garofil: 32734: Src/mem.c: remove unused pointers + + * Nikolas Garofil: 32733: Src/prototypes.h: use size_t in bcopy() + + * Nikolas Garofil: 32732 (tweak per 32739): Src/compat.c: fix + const declaration inconsistency + +2014-06-06 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Jun T: 32719: Doc/Zsh/contrib.yo: minor issues. + + * Jun T: 32715: Doc/Zsh/calsys.yo, Doc/Zsh/grammar.yo, + Doc/Zsh/zle.yo: formatting fixes. + + * 32682 with tweaks: Doc/Zsh/options.yo, Src/hist.c, + Src/options.c, Src/zsh.h: INC_APPEND_HISTORY_TIME is new + behaviour, with INC_APPEND_HISTORY reverting to its previous + behaviour. + + * Andrew Magee: 32698: Completion/Unix/Command/_hg: show + committable files. + +2014-06-05 Barton E. Schaefer <schaefer@zsh.org> + + * 32723: Src/glob.c: add braces around some if/else branches + + * 32716 (via Jun T. 31714): Src/utils.c: properly test iconv + return values for error conditions 2014-06-04 Barton E. Schaefer <schaefer@zsh.org> |