about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-07-03 17:06:04 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-07-03 17:06:04 +0000
commit876fa2c44e0a17b2d10a2547ac1d13687cfed520 (patch)
treef92ce7475c97f82a05e20e9ba8be9b83436c9b6b /ChangeLog
parent6fa964914d8be709b1145399108ef1535a0b3f39 (diff)
downloadzsh-876fa2c44e0a17b2d10a2547ac1d13687cfed520.tar.gz
zsh-876fa2c44e0a17b2d10a2547ac1d13687cfed520.tar.xz
zsh-876fa2c44e0a17b2d10a2547ac1d13687cfed520.zip
unposted: force latest version of files from vendor to main branch
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d24d2e11..8d3683c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-03  Peter Stephenson  <pws@csr.com>
+
+	* unposted: Doc/Zsh/mod_cap.yo, Doc/Zsh/mod_complete.yo,
+	Doc/Zsh/mod_example.yo, Doc/Zsh/mod_files.yo,
+	Doc/Zsh/mod_mapfile.yo, Doc/Zsh/mod_zleparameter.yo, Doc/intro.ms,
+	Doc/zshzftpsys.yo, Etc/Makefile.in,
+	Functions/Prompts/prompt_adam1_setup,
+	Functions/Prompts/prompt_redhat_setup,
+	Functions/Prompts/prompt_suse_setup, Functions/Zftp/zfrglob,
+	Functions/Zftp/zftp_chpwd, Misc/.distfiles, Misc/bash2zshprompt,
+	Misc/c2z, Misc/compctl-examples, Misc/globtests.ksh,
+	Misc/job-control-tests, Misc/lete2ctl, Src/Zle/.distfiles,
+	Util/preconfig, aclocal.m4: jiggery pokery to force files
+	onto main branch (1.X) from vendor branch (1.1.1.X).
+
 2007-07-03  Clint Adams  <clint@zsh.org>
 
 	* 23645: Functions/Zftp/zfautocheck: use == instead of =.