Ignore:
Timestamp:
2010-11-08T07:13:25Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
63a1e60
Parents:
d70a463 (diff), 3da12d74 (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.h

    rd70a463 rb40bfac  
    6262 * @see nildummy_proto
    6363 */
    64 typedef struct nildummy_proto   nildummy_proto_t;
     64typedef struct nildummy_proto nildummy_proto_t;
    6565
    6666/** Type definition of the dummy nil protocol specific data pointer.
     
    100100
    101101/** Dummy nil global data. */
    102 struct  nildummy_globals {
     102struct nildummy_globals {
    103103        /** Networking module phone. */
    104104        int net_phone;
Note: See TracChangeset for help on using the changeset viewer.