Fixed up conflicts.
authormichaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 5 Jun 2000 00:31:36 +0000 (00:31 +0000)
committermichaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 5 Jun 2000 00:31:36 +0000 (00:31 +0000)
commit25c5f9b70be439731c3ad8c8b1ffdb4892e758db
tree1bad998734ce6e3262cef4f168ca67afeef3a9c1
parent646879b54a5b6a5388fdee6e8091d20e564c2568
Fixed up conflicts.

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@274 4a8a32a2-be11-0410-ad9d-d568d2c75423
support/scripts/build.mak