summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-02 23:46:24 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-06-02 23:46:24 +1000
commit00e1abb1ebe13ab24e812f68715f46e65e7c5271 (patch)
treec6a7cab0fc8ad4c454845901457e86afdc6e23e3
parent86211d1738695e63b2a68f0c3a4f60e1a9d9bda3 (diff)
downloadopenssh-git-00e1abb1ebe13ab24e812f68715f46e65e7c5271.tar.gz
- dtucker@cvs.openbsd.org 2013/06/02 13:33:05
[progressmeter.c] Add misc.h for monotime prototype. (id sync only)
-rw-r--r--ChangeLog4
-rw-r--r--progressmeter.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 058579f5..0a66555b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
20130602
- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
linking regress/modpipe.
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2013/06/02 13:33:05
+ [progressmeter.c]
+ Add misc.h for monotime prototype. (ID sync only).
20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/progressmeter.c b/progressmeter.c
index 0e570e41..332bd3c9 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.38 2013/06/01 13:15:52 dtucker Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.39 2013/06/02 13:33:05 dtucker Exp $ */
/*
* Copyright (c) 2003 Nils Nordman. All rights reserved.
*