Changeset 92574f4 in mainline for .bzrignore


Ignore:
Timestamp:
2011-02-24T12:03:27Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e7b7ebd5
Parents:
4837092 (diff), a80849c (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 development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:
1 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    r4837092 r92574f4  
    8484./uspace/drv/test1/test1
    8585./uspace/drv/test2/test2
    86 ./uspace/drv/uhci/uhci
     86./uspace/drv/uhci-hcd/uhci-hcd
     87./uspace/drv/uhci-rhd/uhci-rhd
    8788./uspace/drv/usbhub/usbhub
    8889./uspace/drv/usbhid/usbhid
     90./uspace/drv/usbmid/usbmid
    8991./uspace/drv/vhc/vhc
    9092./uspace/srv/bd/ata_bd/ata_bd
Note: See TracChangeset for help on using the changeset viewer.