Changeset ea15a89a in mainline

Timestamp:

2013-04-29T14:26:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

533e2d7, 94dfb92

Parents:

b2fa2d86 (diff), 9e7898e (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

Files:

• boot/generic/include/memstr.h (modified) (view diffs)
• boot/generic/src/memstr.c (modified) (view diffs)
• defaults/amd64/Makefile.config (modified) (view diffs)
• defaults/arm32/Makefile.config (modified) (view diffs)
• defaults/arm32/beagleboardxm/Makefile.config (modified) (view diffs)
• defaults/arm32/beaglebone/Makefile.config (modified) (view diffs)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• defaults/ia32/Makefile.config (modified) (view diffs)
• defaults/ia64/Makefile.config (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/mips64/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/fb/logo-196x66.c (deleted)
• kernel/generic/include/lib/memfnc.h (modified) (view diffs)
• tools/mkext2.py (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
• uspace/app/bnchmark/bnchmark.c (modified) (view diffs)
• uspace/app/edit/edit.c (modified) (view diffs)
• uspace/app/mkbd/main.c (modified) (view diffs)
• uspace/app/msim/arch_helenos/input.c (modified) (view diffs)
• uspace/app/nterm/nterm.c (modified) (view diffs)
• uspace/app/ping/ping.c (modified) (view diffs)
• uspace/app/taskdump/symtab.c (modified) (view diffs)
• uspace/app/tester/ipc/starve.c (modified) (view diffs)
• uspace/app/tetris/scores.c (modified) (view diffs)
• uspace/app/tetris/screen.c (modified) (view diffs)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/app/trace/ipc_desc.c (modified) (view diffs)
• uspace/app/trace/ipc_desc.h (modified) (view diffs)
• uspace/app/trace/ipcp.c (modified) (view diffs)
• uspace/app/trace/syscalls.c (modified) (view diffs)
• uspace/app/trace/syscalls.h (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/app/vdemo/vdemo.c (modified) (view diffs)
• uspace/app/vlaunch/Makefile (modified) (view diffs)
• uspace/app/vlaunch/gfx/helenos.tga (added)
• uspace/app/vlaunch/vlaunch.c (modified) (view diffs)
• uspace/dist/src/c/demos/tetris/scores.c (modified) (view diffs)
• uspace/dist/src/c/demos/top/screen.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
• uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/setjmp.S (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/io/con_srv.c (modified) (view diffs)
• uspace/lib/c/generic/io/console.c (modified) (view diffs)
• uspace/lib/c/include/io/con_srv.h (modified) (view diffs)
• uspace/lib/c/include/io/cons_event.h (added)
• uspace/lib/c/include/io/console.h (modified) (view diffs)
• uspace/lib/c/include/io/pos_event.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (view diffs)
• uspace/lib/c/include/io/window.h (modified) (view diffs)
• uspace/lib/c/include/mem.h (modified) (view diffs)
• uspace/lib/c/include/setjmp.h (modified) (view diffs)
• uspace/lib/c/include/sys/types.h (modified) (view diffs)
• uspace/lib/clui/tinput.c (modified) (view diffs)
• uspace/lib/clui/tinput.h (modified) (view diffs)
• uspace/lib/gui/Makefile (modified) (view diffs)
• uspace/lib/gui/canvas.c (added)
• uspace/lib/gui/canvas.h (added)
• uspace/lib/gui/grid.c (modified) (view diffs)
• uspace/lib/gui/grid.h (modified) (view diffs)
• uspace/lib/gui/terminal.c (modified) (view diffs)
• uspace/lib/gui/window.c (modified) (view diffs)
• uspace/lib/posix/include/posix/fcntl.h (modified) (view diffs)
• uspace/lib/posix/include/posix/float.h (modified) (view diffs)
• uspace/lib/posix/include/posix/limits.h (modified) (view diffs)
• uspace/lib/posix/include/posix/math.h (modified) (view diffs)
• uspace/lib/posix/include/posix/stdio.h (modified) (view diffs)
• uspace/lib/posix/source/math.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_dentry.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_dentry.h (modified) (view diffs)
• uspace/srv/hid/compositor/Makefile (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
• uspace/srv/hid/compositor/gfx/helenos.tga (deleted)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
• uspace/srv/net/ethip/ethip.c (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)