summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-08-09 02:28:37 +1000
committerDamien Miller <djm@mindrot.org>2010-08-09 02:28:37 +1000
commit7e569b883c250cc05868a6d558b363066d649112 (patch)
treefe62d8388368c93e9096a4009899d59ead7b7a2a
parent8e604acd441234a4d1f720beac66c24fcf8c7e5a (diff)
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/08/08 16:26:42 [version.h] crank to 5.6
-rw-r--r--ChangeLog6
-rw-r--r--version.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2615456..35144239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20100809
+ - OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2010/08/08 16:26:42
+ [version.h]
+ crank to 5.6
+
20100805
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/08/04 05:37:01
diff --git a/version.h b/version.h
index 5d2b0b74..67d78dcc 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.58 2010/03/16 16:36:49 djm Exp $ */
+/* $OpenBSD: version.h,v 1.59 2010/08/08 16:26:42 djm Exp $ */
-#define SSH_VERSION "OpenSSH_5.5"
+#define SSH_VERSION "OpenSSH_5.6"
#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE