summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-07-31 12:23:16 +1000
committerDamien Miller <djm@mindrot.org>2012-07-31 12:23:16 +1000
commit38fe66230fbb8027e2c8dc7780744af4b6d65176 (patch)
treedb40c20ff4d0770deca334d5236e78c7b17dcdb2
parent46cb75a25840d793e4f7db2b1c7e702fbbfe87df (diff)
- markus@cvs.openbsd.org 2012/07/22 18:19:21
[version.h] openssh 6.1
-rw-r--r--ChangeLog3
-rw-r--r--version.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dafce31..752eb474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- dtucker@cvs.openbsd.org 2012/07/13 01:35:21
[servconf.c]
handle long comments in config files better. bz#2025, ok markus
+ - markus@cvs.openbsd.org 2012/07/22 18:19:21
+ [version.h]
+ openssh 6.1
20120720
- (dtucker) Import regened moduli file.
diff --git a/version.h b/version.h
index 78983d9d..76adaaff 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.64 2012/02/09 20:00:18 markus Exp $ */
+/* $OpenBSD: version.h,v 1.65 2012/07/22 18:19:21 markus Exp $ */
-#define SSH_VERSION "OpenSSH_6.0"
+#define SSH_VERSION "OpenSSH_6.1"
#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE