Changeset 49160c4 in mainline for uspace/app/trace/ipc_desc.c

Timestamp:

2011-08-16T19:17:09Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2aadf2b

Parents:

db6e419

Message:

Resolved conflicts caused by mainline merge.

(No files)