Fixed up conflicts.
[fw/sdcc] / support / scripts /
drwxr-xr-x   ..
-rw-r--r-- 645 Makefile.snapshot
-rw-r--r-- 3905 build.mak
-rw-r--r-- 2051 mega.mak