Ignore:
Timestamp:
2010-11-14T17:25:55Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
481b212
Parents:
982e3d8 (diff), a9db9b8 (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/srv/net/nil/nildummy/nildummy_module.c

    r982e3d8 r8e189ef  
    7878}
    7979
    80 int
    81 nil_module_message_standalone(const char *name, ipc_callid_t callid,
     80int nil_module_message_standalone(const char *name, ipc_callid_t callid,
    8281    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
    8382{
Note: See TracChangeset for help on using the changeset viewer.