| commit | 38a26a92cb16f49321d723dc11c50dc528877c22 | [log] [download] |
|---|---|---|
| author | WHR <msl0000023508@gmail.com> | Fri Aug 19 17:20:13 2016 +0800 |
| committer | WHR <msl0000023508@gmail.com> | Fri Aug 19 17:21:44 2016 +0800 |
| tree | c9bcae3a4b024192cdf6fc0dbdc034a98a6e28f3 | |
| parent | 9ed60d67f89fc3020f709652278355d97a51f8a9 [diff] | |
| parent | 52acf52ad20b7a47b8d646974590a5f6c14e4fe6 [diff] |
Merge commit '52acf52ad20b7a47b8d646974590a5f6c14e4fe6' into 2.88dsf-rivoreo Conflicts: src/Makefile src/dowall.c src/halt.c src/init.c src/killall5.c src/last.c src/shutdown.c src/sulogin.c src/utmp.c src/wall.c