Changeset ccc3debf in mainline for boot


Ignore:
Timestamp:
2012-09-17T13:18:41Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
619e6d56
Parents:
00b4a68 (diff), 289fa65 (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:

Merge from lp:rtc-helenos.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r00b4a68 rccc3debf  
    197197        $(USPACE_PATH)/app/mkbd/mkbd \
    198198        $(USPACE_PATH)/app/websrv/websrv \
     199        $(USPACE_PATH)/app/date/date \
     200        $(USPACE_PATH)/app/vdemo/vdemo \
     201        $(USPACE_PATH)/app/vlaunch/vlaunch \
     202        $(USPACE_PATH)/app/vterm/vterm \
    199203        $(USPACE_PATH)/app/vdemo/vdemo
    200204

  • boot/arch/amd64/Makefile.inc

    r00b4a68 rccc3debf  
    4242        char/ps2mouse \
    4343        char/xtkbd \
     44        time/cmos-rtc \
    4445        bus/usb/ehci\
    4546        bus/usb/ohci \
Note: See TracChangeset for help on using the changeset viewer.