diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-11-10 00:10:18 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-11-10 00:10:18 +0000 |
commit | e69c1559c546742682c460d3aa1dc4c59157acff (patch) | |
tree | 76e357af2ed93b5f0517fe4b72e64c65c19f0387 /sys | |
parent | be0a7e32d4fdd6e1b72857ad15691c7f0b223946 (diff) |
DOH! conflicts from me
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/arc/include/endian.h | 2 | ||||
-rw-r--r-- | sys/arch/arm32/include/endian.h | 2 | ||||
-rw-r--r-- | sys/arch/kbus/include/endian.h | 2 | ||||
-rw-r--r-- | sys/arch/pc532/include/endian.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/arc/include/endian.h b/sys/arch/arc/include/endian.h index 771c96526ff..63b9751e035 100644 --- a/sys/arch/arc/include/endian.h +++ b/sys/arch/arc/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.6 1997/11/09 23:05:03 niklas Exp $ */ +/* $OpenBSD: endian.h,v 1.7 1997/11/10 00:10:13 niklas Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. diff --git a/sys/arch/arm32/include/endian.h b/sys/arch/arm32/include/endian.h index 134ef9b04c6..781bc79d3bf 100644 --- a/sys/arch/arm32/include/endian.h +++ b/sys/arch/arm32/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.4 1997/11/09 23:05:04 niklas Exp $ */ +/* $OpenBSD: endian.h,v 1.5 1997/11/10 00:10:14 niklas Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. diff --git a/sys/arch/kbus/include/endian.h b/sys/arch/kbus/include/endian.h index 1eb417ab2f2..5aa7f1bfcc1 100644 --- a/sys/arch/kbus/include/endian.h +++ b/sys/arch/kbus/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.2 1997/11/09 23:05:07 niklas Exp $ */ +/* $OpenBSD: endian.h,v 1.3 1997/11/10 00:10:15 niklas Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. diff --git a/sys/arch/pc532/include/endian.h b/sys/arch/pc532/include/endian.h index 014e749daaf..b4909155ed0 100644 --- a/sys/arch/pc532/include/endian.h +++ b/sys/arch/pc532/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.4 1997/11/09 23:05:12 niklas Exp $ */ +/* $OpenBSD: endian.h,v 1.5 1997/11/10 00:10:17 niklas Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. |