summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-02-11 08:19:44 +1100
committerDamien Miller <djm@mindrot.org>2012-02-11 08:19:44 +1100
commitdb854559be225497fd43fe4a1ff93356204567f3 (patch)
tree6feebf99ea159dfd444661aef0df2e26b42015d4
parent72de982def3ee6263922d315c7c743c97f600e6c (diff)
- markus@cvs.openbsd.org 2012/02/09 20:00:18
[version.h] move from 6.0-beta to 6.0
-rw-r--r--ChangeLog3
-rw-r--r--version.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fc45168e..df5a955f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
30 - markus@cvs.openbsd.org 2012/01/25 19:40:09 30 - markus@cvs.openbsd.org 2012/01/25 19:40:09
31 [packet.c packet.h] 31 [packet.c packet.h]
32 packet_read_poll() is not used anymore. 32 packet_read_poll() is not used anymore.
33 - markus@cvs.openbsd.org 2012/02/09 20:00:18
34 [version.h]
35 move from 6.0-beta to 6.0
33 36
3420120206 3720120206
35 - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms 38 - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms
diff --git a/version.h b/version.h
index 0c0dfcb72..78983d9dd 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.63 2011/09/23 07:45:05 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.64 2012/02/09 20:00:18 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_6.0-beta" 3#define SSH_VERSION "OpenSSH_6.0"
4 4
5#define SSH_PORTABLE "p1" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE