Fixed up conflicts.
[fw/sdcc] / support / scripts / mega.mak
2000-06-05 michaelhMerge back from 2.21-pre1