From b71ba061fb5ce1f04416248b64fb839d5b03da9c Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Fri, 22 Nov 2002 12:05:26 +0000
Subject: merge changes from 4.1 branch

---
 ChangeLog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 0d9a8eade..69ae912fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,24 @@
+2002-11-22  Oliver Kiddle  <opk@zsh.org>
+
+	* 17958: Completion/Zsh/Command/_ulimit: add missing options
+
 2002-11-13  Clint Adams  <clint@zsh.org>
 
         * 17935: Src/text.c: beautify bin_whence indentation of ()
 	and {} contents.
 
+2002-11-12  Oliver Kiddle  <opk@zsh.org>
+
+	* Zvi Har'El: Completion/Unix/Command/_rcs: complete also for rcsdiff
+
+	* 17928: Zvi Har'El <rl@math.technion.ac.il>:
+	Functions/Zle/edit-command-line: don't interpret escapes when
+	setting the command buffer
+
+	* Thierry Vignaud <tvignaud@mandrakesoft.com>:
+	Completion/Unix/Command/_links, Completion/Mandrake/Command/_urpmi:
+	add option descriptions and missing options
+
 2002-10-18  Clint Adams  <clint@zsh.org>
 
         * unposted: Completion/Debian/Command/_apt: add showsrc part missing
-- 
cgit 1.4.1