summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-07 01:08:46 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-07 01:08:46 +0000
commit8248d116c4c35ce23359edbd66ea41c561a44dbb (patch)
treed1ae27d1245784024f1becf0d2cd6e792955dfda
parentbe48f2b4b1c83e687186fd0bb8bfe9fa76b7a375 (diff)
- (bal) CVS ID Resync of version.h
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f7179990..f22a7eb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120010407
2 - (bal) CVS ID Resync of version.h
3
120010406 420010406
2 - (stevesk) logintest.c: fix for systems without __progname 5 - (stevesk) logintest.c: fix for systems without __progname
3 - (stevesk) Makefile.in: log.o is in libssh.a 6 - (stevesk) Makefile.in: log.o is in libssh.a
@@ -4908,4 +4911,4 @@
4908 - Wrote replacements for strlcpy and mkdtemp 4911 - Wrote replacements for strlcpy and mkdtemp
4909 - Released 1.0pre1 4912 - Released 1.0pre1
4910 4913
4911$Id: ChangeLog,v 1.1074 2001/04/06 01:58:37 stevesk Exp $ 4914$Id: ChangeLog,v 1.1075 2001/04/07 01:08:46 mouring Exp $
diff --git a/version.h b/version.h
index 4569227c2..4c6ae02ce 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
1/* $OpenBSD: version.h,v 1.21 2001/03/27 17:46:50 provos Exp $ */ 1/* $OpenBSD: version.h,v 1.22 2001/04/05 10:39:48 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_2.5.4p1" 3#define SSH_VERSION "OpenSSH_2.5.4p1"