about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-02-26 18:50:27 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-02-26 18:50:27 +0000
commit3425cf5124a4b23aac5f3dd13b337f020591db58 (patch)
treed916aa37af687ced7b01a701a40e0314cf2c9584
parentdb7d0ac34143ed2378c2fd98845b2ae5eaaf6bbb (diff)
downloadzsh-3425cf5124a4b23aac5f3dd13b337f020591db58.tar.gz
zsh-3425cf5124a4b23aac5f3dd13b337f020591db58.tar.xz
zsh-3425cf5124a4b23aac5f3dd13b337f020591db58.zip
update to 4.3.17-dev-0 and fix year
-rw-r--r--ChangeLog8
-rw-r--r--Config/version.mk4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f00df2b5b..2451574cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* unposted: Config/version.mk: Update version to 4.3.17-dev-0 to
+	avoid clash with release, also fix incorrect year noticed by
+	Darryl Zurn.
+
 2012-02-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: 4.3.17.
@@ -16010,5 +16016,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5594 $
+* $Revision: 1.5595 $
 *****************************************************
diff --git a/Config/version.mk b/Config/version.mk
index 2035929f4..00e3f5eab 100644
--- a/Config/version.mk
+++ b/Config/version.mk
@@ -27,5 +27,5 @@
 # This must also serve as a shell script, so do not add spaces around the
 # `=' signs.
 
-VERSION=4.3.17
-VERSION_DATE='February 22, 2011'
+VERSION=4.3.17-dev-0
+VERSION_DATE='February 22, 2012'