Changeset 7bd2c19 in mainline for uspace


Ignore:
Timestamp:
2011-10-19T05:46:29Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8158db7
Parents:
7bc4508 (diff), d75628da (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 with mainline

Location:
uspace
Files:
6 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r7bc4508 r7bd2c19  
    117117        drv/bus/usb/usbmast \
    118118        drv/bus/usb/usbmid \
    119         drv/bus/usb/usbmouse \
    120119        drv/bus/usb/vhc \
    121120        drv/nic/lo \

  • uspace/doc/doxygroups.h

    r7bc4508 r7bd2c19  
    272272
    273273        /**
    274          * @defgroup drvusbmouse USB mouse driver
    275          * @ingroup usb
    276          * @brief USB driver for mouse with boot protocol.
    277          */
    278 
    279         /**
    280274         * @defgroup drvusbmast USB mass storage driver
    281275         * @ingroup usb
Note: See TracChangeset for help on using the changeset viewer.