summaryrefslogtreecommitdiff
path: root/include/memory.h
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>1998-02-02 21:07:13 +0000
committerperry <perry@NetBSD.org>1998-02-02 21:07:13 +0000
commitb7b7322c685652bb1eb4174bee118b0e41887f12 (patch)
tree14e377d760e7367d2dbc88737b9a82c62cc08fe4 /include/memory.h
parent2d33c2a97cdf897740dcf2b458a7731d89e5de32 (diff)
merge lite-2
Diffstat (limited to 'include/memory.h')
-rw-r--r--include/memory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/memory.h b/include/memory.h
index cfd1fdb70e4..4971441fb8a 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,8 +1,8 @@
-/* $NetBSD: memory.h,v 1.3 1994/10/26 00:56:06 cgd Exp $ */
+/* $NetBSD: memory.h,v 1.4 1998/02/02 21:07:32 perry Exp $ */
/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)memory.h 5.5 (Berkeley) 6/1/90
+ * @(#)memory.h 8.1 (Berkeley) 6/2/93
*/
#include <string.h>