Changeset ddb844e in mainline for uspace/lib/c/include/ipc/services.h


Ignore:
Timestamp:
2020-07-03T23:00:34Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e79a025
Parents:
edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ipc/services.h

    redb57bc6 rddb844e  
    5454#define SERVICE_NAME_CLIPBOARD "clipboard"
    5555#define SERVICE_NAME_CORECFG  "corecfg"
     56#define SERVICE_NAME_DISPLAY  "hid/display"
    5657#define SERVICE_NAME_DHCP     "net/dhcp"
    5758#define SERVICE_NAME_DNSR     "net/dnsr"
Note: See TracChangeset for help on using the changeset viewer.