commit | f7b95561acf7cc7d0f433e5973e75f396b925939 | [log] [download] |
---|---|---|
author | JohnnySun <bmy001@gmail.com> | Mon Feb 09 18:19:34 2015 +0800 |
committer | JohnnySun <bmy001@gmail.com> | Mon Feb 09 18:19:34 2015 +0800 |
tree | 5ee45323ca046be34789f5dd599c458693ed5ada | |
parent | dfa514c150d01f6a78aa692e7d9d0c3e96b1b47f [diff] | |
parent | a18810ac1c09e0178e4dfd0c46470776f35b1247 [diff] |
Merge branch 'unstable' into 'master' Conflicts: Makefile README cat_u.c chmod.c chmod_u.c chown_u.c cmp.c cmp_u.c config/tools.h config/wcedef.h date.c date_u.c dd.c dd_u.c defmain.sh df.c df_u.c du.c du_u.c getevent_u.c hd.c hd_u.c ls_u.c maclib/Makefile maclib/libcrypto.dylib md5.c md5_u.c mtd.h nt.mk posix-io-for-windows/Makefile posix-io-for-windows/creat.c posix-io-for-windows/lseek.c r.c r_u.c setconsole_u.c timefunc.h toolbox.c touch.c touch_u.c uptime.c uptime_u.c wcelib/c.dll