From 94980999a6873a9da842f0e49dee28c6fe086987 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Fri, 25 Jul 2003 10:15:17 +0000
Subject: merge changes from 4.1

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ccbdf0a81..a89f02280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-23  Oliver Kiddle  <opk@zsh.org>
+
+	* 18890: Completion/Unix/Command/_sablotron: new sabcmd completion
+
+	* 18877: Etc/completion-style-guide: add a few more points
+
+2003-07-17  Oliver Kiddle  <opk@zsh.org>
+
+	* 18866: Etc/completion-style-guide: document conventions used
+	in completion functions
+
 2003-07-17  Peter Stephenson  <pws@csr.com>
 
 	* 18864: Src/lex.c: unnecessary spaces with empty substitutions
-- 
cgit 1.4.1