diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-23 08:47:08 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-23 08:47:08 -0700 |
| commit | 0702cda61bdf821d6bff8b58f1ccd475ffaddae0 (patch) | |
| tree | 7f64285360aba631c206b6bf82e1465c149c1d32 | |
| parent | 933a0c45d288395fefc7bff03b6b48668b694f33 (diff) | |
| download | zsh-0702cda61bdf821d6bff8b58f1ccd475ffaddae0.tar.gz zsh-0702cda61bdf821d6bff8b58f1ccd475ffaddae0.tar.xz zsh-0702cda61bdf821d6bff8b58f1ccd475ffaddae0.zip | |
Resolve conflict with origin/master
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 888ba0599..f7da9b01a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ * 32898 (credit Jun T.): Doc/Zsh/mod_pcre.yo: fix bug in 32891. +2014-07-23 Ansgar Burchardt <ansgar@debian.org> + + * 32895: Completion/Unix/Command/_nm: Match more shared library + names. + 2014-07-20 Barton E. Schaefer <schaefer@zsh.org> * unposted: Doc/Zsh/builtins.yo: force retention of whitespace |