Merge branch from toybox/master
authorHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 16 Jul 2015 05:10:30 +0000 (14:10 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 16 Jul 2015 05:10:36 +0000 (14:10 +0900)
commitc353de2e55d0f64f4b11dbc242f8319674650c54
tree4903817ed5bc386f11ea4a2877b87606a5ce6efc
parent05423b7d418fa33f4c812b8262c21f9401ee3a98
parentccec4d82798d46a8bc7e7656d08c57544cd08582
Merge branch from toybox/master
Conflicts:
both modified:      lib/portability.c
both modified:      lib/portability.h
both modified:      scripts/genconfig.sh
both modified:      scripts/runtest.sh
both added:         tests/sed.test
both modified:      toys/other/acpi.c
both modified:      toys/other/ifconfig.c
deleted by them:    toys/other/unshare.c
both added:         toys/pending/hwclock.c
both modified:      toys/pending/ip.c
deleted by them:    toys/pending/sed.c
both modified:      toys/posix/chgrp.c
both modified:      toys/posix/cp.c
both modified:      toys/posix/id.c
both modified:      toys/posix/ls.c

Change-Id: Ib36c5267ec054a5683ca37da2383d83b3cb1b5b4
Signed-off-by: Hyejin Kim <hyejin0906.kim@samsung.com>
lib/portability.c
tests/sed.test
toys.h
toys/other/netcat.c