diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-08-30 12:45:27 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-08-30 12:45:27 +0200 |
| commit | 377fde7fc7770a3dc3d74a24302ad2aea9dadeab (patch) | |
| tree | 2699cf316877a6778cc813aa2025d1424161e597 | |
| parent | 755a44895a08c686bf1f8d734587dda015808e8d (diff) | |
| parent | 5dd476786ccafd698816608ed87bbea7d1b210b2 (diff) | |
| download | zsh-377fde7fc7770a3dc3d74a24302ad2aea9dadeab.tar.gz zsh-377fde7fc7770a3dc3d74a24302ad2aea9dadeab.zip | |
Merge branch 'upstream' into debian
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Config/version.mk | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2014-08-28 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * unposted: Config/version.mk: 5.0.6. + 2014-08-24 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Config/version.mk: 5.0.5-dev-3. diff --git a/Config/version.mk b/Config/version.mk index 78f1490ef..949f58af4 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.5-dev-3 -VERSION_DATE='August 24, 2014' +VERSION=5.0.6 +VERSION_DATE='August 28, 2014' |