Changeset 88dea9d in mainline for kernel/Makefile


Ignore:
Timestamp:
2010-04-17T16:28:49Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
30a5470
Parents:
5ba201d (diff), 95319bd (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 from measuring branch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r5ba201d r88dea9d  
    229229        generic/src/ipc/event.c \
    230230        generic/src/security/cap.c \
    231         generic/src/sysinfo/sysinfo.c
     231        generic/src/sysinfo/sysinfo.c \
     232        generic/src/ps/ps.c \
     233        generic/src/ps/cpu.c \
     234        generic/src/ps/load.c \
     235        generic/src/ps/uptime.c \
     236        generic/src/ps/mem.c
    232237
    233238## Kernel console support
Note: See TracChangeset for help on using the changeset viewer.