Ignore:
Timestamp:
2010-11-19T23:50:06Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
46d4d9f
Parents:
b4c9c61 (diff), a9c6b966 (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

    rb4c9c61 rfdbc3ff  
    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.