Jordan K. Hubbard 8dd4744e1a Fix merge spam ...

Spotted by:	Alex Nash

1997-09-23 16:28:00 +00:00

..

defines

Add some more defines that don't change the genericness of a file.

1995-05-11 20:21:23 +00:00

files

Move the rules for aicasm to the MI conf file.

1997-09-21 21:32:04 +00:00

files.i386

Move the rules for aicasm to the MI conf file.

1997-09-21 21:34:31 +00:00

files.newconf

Add lines for new files in ipfilter

1997-05-25 15:56:18 +00:00

files.pc98

Synchronize with sys/i386/conf/files.i386 revision 1.177.

1997-09-22 12:18:52 +00:00

kern.mk

Revert $FreeBSD$ to $Id$

1997-02-22 14:13:04 +00:00

kmod.mk

Added ${KMOD} to CLEANFILES. ${KMOD} gets created if you run `make load'.

1997-07-21 16:04:41 +00:00

majors

Reserve entry for CAN16-2 CAN-PC Interface

1997-09-23 08:45:33 +00:00

Makefile.i386

Add option for compiling in a 8x16 font.

1997-07-25 11:53:30 +00:00

Makefile.pc98

Synchronize with sys/i386/conf/Makefile.i386 revision 1.101.

1997-07-26 01:34:05 +00:00

Makefile.powerpc

Add option for compiling in a 8x16 font.

1997-07-25 11:53:30 +00:00

newvers.sh

Delete $Id$ line from copyright.

1997-07-09 20:38:19 +00:00

nfsswapkernel.c

Removed vestiges of config-time "argument processing" configuration.

1997-09-07 13:49:56 +00:00

NOTES

Fix merge spam

1997-09-23 16:28:00 +00:00

options

Make MFS a supported option, finally.

1997-09-22 21:24:03 +00:00

options.i386

teach sio how to attach to isa PnP cards. This is mainly for use with

1997-09-19 15:25:49 +00:00

options.pc98

Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/sio.c

1997-09-20 05:28:02 +00:00

param.c

Removed unused #includes.

1997-06-14 11:38:46 +00:00

systags.sh

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00