Changeset ff381a7 in mainline for uspace/app/trace/errors.c


Ignore:
Timestamp:
2015-11-02T20:54:19Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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/app/trace/errors.c

    r3feeab2 rff381a7  
    4646        [-EPERM]        = { "EPERM",            "Permission denied" },
    4747        [-EHANGUP]      = { "EHANGUP",          "Answerbox closed connection" },
    48         [-EEXISTS]      = { "EEXISTS",          "Entry already exists" },
     48        [-EEXIST]       = { "EEXIST",           "Entry already exists" },
    4949        [-EBADMEM]      = { "EBADMEM",          "Bad memory pointer" },
    5050
Note: See TracChangeset for help on using the changeset viewer.