ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
compressed | ||
tools | ||
Makefile | ||
bootsect.S | ||
edd.S | ||
install.sh | ||
mtools.conf.in | ||
setup.S | ||
video.S |
ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
compressed | ||
tools | ||
Makefile | ||
bootsect.S | ||
edd.S | ||
install.sh | ||
mtools.conf.in | ||
setup.S | ||
video.S |