about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a80c8dff9..81e37b1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 22056: Functions/MIME/zsh-mime-handler: restore original default
+	settings for current-shell and never-background styles.
+
 2005-12-07  Clint Adams  <clint@zsh.org>
 
 	* 22054: Completion/Linux/Command/_fusermount:
@@ -33,6 +38,7 @@
 	is not changed; add most-specific zstyle necessary to identify the
 	all-expansions group within _expand_word_and_keep.
 
+>>>>>>> 1.2956
 2005-12-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 22049: Src/init.c: "exit" within sourced file within shell