Ignore:
Timestamp:
2012-08-21T10:04:16Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
67edca6
Parents:
0da6c04 (diff), 6a97f2e (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 upstream (lp:~wtachi/helenos/bithenge)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r0da6c04 r5e718d9  
    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.