summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--monitor_wrap.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b4cfc717..c0b850342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
53 - stevesk@cvs.openbsd.org 2006/07/06 16:22:39 53 - stevesk@cvs.openbsd.org 2006/07/06 16:22:39
54 [ssh-keygen.c] 54 [ssh-keygen.c]
55 move #include "dns.h" up 55 move #include "dns.h" up
56 - stevesk@cvs.openbsd.org 2006/07/06 17:36:37
57 [monitor_wrap.h]
58 typo in comment
56 59
5720060706 6020060706
58 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 61 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4786,4 +4789,4 @@
4786 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4789 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4787 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4790 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4788 4791
4789$Id: ChangeLog,v 1.4372 2006/07/10 10:53:31 djm Exp $ 4792$Id: ChangeLog,v 1.4373 2006/07/10 10:53:45 djm Exp $
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 0f3b211c9..4366b8ed0 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.17 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.18 2006/07/06 17:36:37 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -116,4 +116,4 @@ void *mm_zalloc(struct mm_master *, u_int, u_int);
116void mm_zfree(struct mm_master *, void *); 116void mm_zfree(struct mm_master *, void *);
117void mm_init_compression(struct mm_master *); 117void mm_init_compression(struct mm_master *);
118 118
119#endif /* _MM_H_ */ 119#endif /* _MM_WRAP_H_ */