Changeset c7b5826 in mainline for boot


Ignore:
Timestamp:
2011-05-18T09:34:56Z (15 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
33d19a7
Parents:
d736fe38 (diff), b2995c3 (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:

Development branch changes

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rd736fe38 rc7b5826  
    157157        $(USPACE_PATH)/app/usbinfo/usbinfo \
    158158        $(USPACE_PATH)/app/vuhid/vuh \
     159        $(USPACE_PATH)/app/mkbd/mkbd \
    159160        $(USPACE_PATH)/app/websrv/websrv
    160161

  • boot/arch/amd64/Makefile.inc

    rd736fe38 rc7b5826  
    4949        usbflbk \
    5050        usbhub \
    51         usbkbd \
    5251        usbhid \
    5352        usbmast \
Note: See TracChangeset for help on using the changeset viewer.