Changeset 6265a2b in mainline for uspace/app/top/top.h

Timestamp:

2011-01-26T14:52:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7fc092a, 9f0318c, ea6a824

Parents:

192a0063 (diff), a0ce870 (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:

• uspace/app/top/top.h (modified) (1 diff)

uspace/app/top/top.h

@@ -77 +77 @@
 typedef struct {
         fixed_float virtmem;
+        fixed_float resmem;
         fixed_float ucycles;
         fixed_float kcycles;