summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2013-12-21 17:09:16 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2013-12-21 17:09:16 -0800
commit634c03c76d15c0aafa945feb5e80a50738e496c3 (patch)
tree497ad9bc788ac7aea1a0f5e10a8abcea9eccf898
parent21be065ddf74d97cd400c7cc9df5ddfa436c00d7 (diff)
parent3fb1e6e822a5983eed233a7d436163735263f173 (diff)
downloadzsh-634c03c76d15c0aafa945feb5e80a50738e496c3.tar.gz
zsh-634c03c76d15c0aafa945feb5e80a50738e496c3.tar.xz
zsh-634c03c76d15c0aafa945feb5e80a50738e496c3.zip
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts:
	ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--Config/version.mk4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f108113d..c4760218e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Config/version.mk: update version to 5.0.4-dev-0 so as
+	not to clash with release.
+
 2013-12-20  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 32172; Test/A05execution.ztst: regression test for 32171
diff --git a/Config/version.mk b/Config/version.mk
index b554719e9..d1e95087e 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=5.0.4
-VERSION_DATE='December 20, 2013'
+VERSION=5.0.4-dev-0
+VERSION_DATE='December 21, 2013'