Ignore:
Timestamp:
2010-11-18T21:58:27Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4e5c7ba
Parents:
69e0d6d (diff), 45f04f8 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/cmds/modules/bdd/bdd.c

    r69e0d6d rcb569e6  
    6868        unsigned int argc;
    6969        unsigned int i, j;
    70         dev_handle_t handle;
     70        devmap_handle_t handle;
    7171        uint8_t *blk;
    7272        size_t size, bytes, rows;
Note: See TracChangeset for help on using the changeset viewer.