diff options
author | peter <peter@FreeBSD.org> | 1999-11-01 04:12:42 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-11-01 04:12:42 +0000 |
commit | fca471ec42bada1c90361e23d945d8394aee572d (patch) | |
tree | e81ef59866284be1207bda6e8312b843dea6d245 /usr.sbin/mergemaster/Makefile | |
parent | ff69a3419a01e76430b1a5938ddd60bbe386df67 (diff) | |
download | FreeBSD-src-fca471ec42bada1c90361e23d945d8394aee572d.zip FreeBSD-src-fca471ec42bada1c90361e23d945d8394aee572d.tar.gz |
Merge the alpha and x86 majors files together. There appear to be
only two conflicts, cdev #98 and cdev #99. These should be fixed.
MAKEDEV should probably be merged as well.
Static majors are (hopefully) going away one day soon.
This file is informational and not machine parsed by anything any more.
Diffstat (limited to 'usr.sbin/mergemaster/Makefile')
0 files changed, 0 insertions, 0 deletions