Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ppc32/loader/Makefile.common

    r918e9910 r827d73f  
    3535DEPEND = Makefile.depend
    3636DEPEND_PREV = $(DEPEND).prev
     37JOB = image.job
    3738OUTPUT = image.boot
    3839
     
    4243KERNELDIR = ../../../../kernel
    4344USPACEDIR = ../../../../uspace
     45
     46RD_SRVS += \
     47        $(USPACEDIR)/srv/hid/adb_mouse/adb_ms \
     48        $(USPACEDIR)/srv/hw/bus/cuda_adb/cuda_adb
Note: See TracChangeset for help on using the changeset viewer.