diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
| commit | c7c51eca164ea2e23c1f10b0e63030e66588f27a (patch) | |
| tree | 15e78786da9562f49ad284e5dad2e190694a885f /ChangeLog | |
| parent | 026cb6a8127dfb9a6277ec42cc251ebc77e1300e (diff) | |
| parent | 8efa4b4088a9f57903954a12eb086b176109bd91 (diff) | |
| download | zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.gz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.xz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.zip | |
Fix conflicts in ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index aee919de0..edc128247 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,21 @@ problems with inserting a line into B02, instead add a placeholder and substitute for it. +2015-11-27 Peter Stephenson <p.stephenson@samsung.com> + + * unposted: Functions/Misc/zcalc: ZCALCPROMPT created globally. + +2015-11-27 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 37214: Functions/Prompts/prompt_walters_setup: 'prompt + walters': Don't export PS1 + + * 37163: Completion/Unix/Command/_curl, + Completion/Unix/Type/_urls: Remove curl completion + + * 37215: Completion/Base/Utility/_regex_words: _regex_words: + Don't add mismatched parentheses + 2015-11-26 Barton E. Schaefer <schaefer@zsh.org> * 37229: Src/Modules/param_private.c, Test/V10private.ztst: non- |