Fix merging problems
authorbernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 28 Jan 2002 10:32:22 +0000 (10:32 +0000)
committerbernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 28 Jan 2002 10:32:22 +0000 (10:32 +0000)
commit2152d670ac7f7a7a65bc20dbdbe346b9747e552a
treedb9ec925ad5967879e136a7303a269e43b60c50e
parent8c8f34ff4281a55d2f535335c02999246e9e12f2
Fix merging problems

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1851 4a8a32a2-be11-0410-ad9d-d568d2c75423
sim/ucsim/s51.src/uc89c51r.cc
sim/ucsim/sim.src/memcl.h