Stefan Roese f2302d4430 Fix merge problems ...

Signed-off-by: Stefan Roese <sr@denx.de>

2008-08-06 14:05:38 +02:00

..

crt0.S

…

demo.c

Fix merge problems

2008-08-06 14:05:38 +02:00

glue.c

…

glue.h

…

libgenwrap.c

API: Provide dummy halt() in the glue layer.

2008-01-29 17:00:34 +01:00

Makefile

API: Convert conditional building to the new scheme.

2008-01-29 16:57:38 +01:00