Changeset 467bf40 in mainline for uspace/app

Timestamp:
2010-12-25T15:13:07Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a465a56, e84d65a
Parents:
ab49a0d (diff), 6eb794a (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

Conflicts: no problem resolving.

Location:
uspace/app/sysinfo
Files:
2 added

Note: See TracChangeset for help on using the changeset viewer.