Ignore:
Timestamp:
2011-06-01T08:43:42Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d6c1f1
Parents:
9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/arch/uspace/srv/ns/service.adl

    r9e2e715 reb522e8  
    22                /* Establish connection with the service
    33                   (this call is forwarded from Naming Service or Device Mapper) */
    4                 ipcarg_t ipc_m_connect_me_to(void);
     4                sysarg_t ipc_m_connect_me_to(void);
    55               
    66                /* Close connection */
    7                 ipcarg_t ipc_m_phone_hungup(void);
     7                sysarg_t ipc_m_phone_hungup(void);
    88};
Note: See TracChangeset for help on using the changeset viewer.