Ignore:
Timestamp:
2012-08-24T14:07:52Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
041ab64
Parents:
bd29f9c9 (diff), db81577 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/arch/uspace/srv/fs/fat/fat.bp

    rbd29f9c9 rbeb9336  
    77                        ?ipc_m_data_write /* mount options */ ;
    88                        tentative {
    9                                 [/uspace/lib/libblock/fnc.block_init%rd]
     9                                [/uspace/lib/block/fnc.block_init%rd]
    1010                        }
    1111                } +
Note: See TracChangeset for help on using the changeset viewer.