summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-22 01:08:39 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-22 01:08:39 +0000
commitebf3d51c9615c76ca85f07224373630581ed669b (patch)
tree59716b0e221386181dbe67a04506ce240382fe16
parentbebd8be67bd8fc8e832faf0ed635f9e8a46ca126 (diff)
- (bal) version.c CVS ID resync
-rw-r--r--ChangeLog3
-rw-r--r--version.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 27b5ad971..080e148e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120010322 120010322
2 - (djm) Better AIX no tty fix, spotted by Gert Doering <gert@greenie.muc.de> 2 - (djm) Better AIX no tty fix, spotted by Gert Doering <gert@greenie.muc.de>
3 - (bal) version.c CVS ID resync
3 4
420010321 520010321
5 - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 6 - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
@@ -4659,4 +4660,4 @@
4659 - Wrote replacements for strlcpy and mkdtemp 4660 - Wrote replacements for strlcpy and mkdtemp
4660 - Released 1.0pre1 4661 - Released 1.0pre1
4661 4662
4662$Id: ChangeLog,v 1.999 2001/03/22 00:58:15 djm Exp $ 4663$Id: ChangeLog,v 1.1000 2001/03/22 01:08:39 mouring Exp $
diff --git a/version.h b/version.h
index 449f1ec2b..8ece8d0e3 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
1/* $OpenBSD: version.h,v 1.19 2001/02/19 10:35:23 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.20 2001/03/19 17:12:10 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_2.5.2p1" 3#define SSH_VERSION "OpenSSH_2.5.2p1"