From 0702cda61bdf821d6bff8b58f1ccd475ffaddae0 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Wed, 23 Jul 2014 08:47:08 -0700 Subject: Resolve conflict with origin/master --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) 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 + + * 32895: Completion/Unix/Command/_nm: Match more shared library + names. + 2014-07-20 Barton E. Schaefer * unposted: Doc/Zsh/builtins.yo: force retention of whitespace -- cgit 1.4.1