Changeset ad7a6c9 in mainline for uspace/app

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
• bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• bdsh/cmds/modules/cat/cat.h (modified) (view diffs)
• bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• bdsh/cmds/modules/mkfile/mkfile.c (modified) (view diffs)
• bdsh/cmds/modules/mount/mount.c (modified) (view diffs)
• bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• init/init.c (modified) (view diffs)
• kill/Makefile (moved) (moved from uspace/app/tasks/Makefile ) (view diffs)
• kill/kill.c (added)
• killall/Makefile (moved) (moved from uspace/srv/net/cfg/Makefile ) (view diffs)
• killall/killall.c (moved) (moved from uspace/srv/net/nil/eth/eth_module.c ) (view diffs)
• klog/klog.c (modified) (view diffs)
• netecho/netecho.c (modified) (view diffs)
• ping/ping.c (modified) (view diffs)
• sbi/Makefile (modified) (view diffs)
• sbi/src/builtin.c (modified) (view diffs)
• sbi/src/builtin/bi_console.c (moved) (moved from uspace/app/sbi/src/builtin/bi_fun.c ) (view diffs)
• sbi/src/builtin/bi_console.h (added)
• sbi/src/builtin/bi_task.c (added)
• sbi/src/builtin/bi_task.h (moved) (moved from uspace/app/sbi/src/builtin/bi_fun.h ) (view diffs)
• sbi/src/imode.c (modified) (view diffs)
• sbi/src/intmap.c (modified) (view diffs)
• sbi/src/intmap.h (modified) (view diffs)
• sbi/src/lex.c (modified) (view diffs)
• sbi/src/lex_t.h (modified) (view diffs)
• sbi/src/list.c (modified) (view diffs)
• sbi/src/list.h (modified) (view diffs)
• sbi/src/parse.c (modified) (view diffs)
• sbi/src/rdata.c (modified) (view diffs)
• sbi/src/rdata.h (modified) (view diffs)
• sbi/src/rdata_t.h (modified) (view diffs)
• sbi/src/run.c (modified) (view diffs)
• sbi/src/run.h (modified) (view diffs)
• sbi/src/run_expr.c (modified) (view diffs)
• sbi/src/run_expr.h (modified) (view diffs)
• sbi/src/stree.c (modified) (view diffs)
• sbi/src/stree.h (modified) (view diffs)
• sbi/src/stree_t.h (modified) (view diffs)
• sbi/src/stype.c (modified) (view diffs)
• sbi/src/stype_expr.c (modified) (view diffs)
• stats/stats.c (modified) (view diffs)
• sysinfo/Makefile (added)
• sysinfo/sysinfo.c (added)
• taskdump/taskdump.c (modified) (view diffs)
• tasks/tasks.c (deleted)
• tester/Makefile (modified) (view diffs)
• tester/fault/fault2.c (modified) (view diffs)
• tester/hw/misc/virtchar1.c (modified) (view diffs)
• tester/hw/serial/serial1.c (modified) (view diffs)
• tester/ipc/connect.c (deleted)
• tester/ipc/connect.def (deleted)
• tester/ipc/register.def (deleted)
• tester/tester.c (modified) (view diffs)
• tester/tester.h (modified) (view diffs)
• tester/vfs/vfs1.c (modified) (view diffs)
• tetris/screen.h (modified) (view diffs)
• top/screen.c (modified) (view diffs)
• top/top.c (modified) (view diffs)
• top/top.h (modified) (view diffs)
• trace/ipc_desc.c (modified) (view diffs)
• trace/ipcp.h (modified) (view diffs)
• trace/proto.c (modified) (view diffs)
• trace/proto.h (modified) (view diffs)
• trace/syscalls.c (modified) (view diffs)
• trace/trace.c (modified) (view diffs)
• websrv/Makefile (added)
• websrv/websrv.c (added)