summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 18f289c31..52b6650a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2003/03/17 10:38:38 3 - markus@cvs.openbsd.org 2003/03/17 10:38:38
4 [progressmeter.c] 4 [progressmeter.c]
5 don't print \n if backgrounded; from ho@ 5 don't print \n if backgrounded; from ho@
6 - markus@cvs.openbsd.org 2003/03/17 11:43:47
7 [version.h]
8 enter 3.6
6 9
720030318 1020030318
8 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] 11 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1228,4 +1231,4 @@
1228 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1231 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1229 ok provos@ 1232 ok provos@
1230 1233
1231$Id: ChangeLog,v 1.2632 2003/03/19 23:08:05 djm Exp $ 1234$Id: ChangeLog,v 1.2633 2003/03/19 23:11:34 djm Exp $
diff --git a/version.h b/version.h
index 1f1129924..380e35907 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,3 @@
1/* $OpenBSD: version.h,v 1.35 2002/10/01 13:24:50 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.36 2003/03/17 11:43:47 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_3.5p1" 3#define SSH_VERSION "OpenSSH_3.6p1"
4