merge with 1.9.4j

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index be404b68792a043422ac40f1405f3452d1c80d59..23f4c63c68174886cd8a176593dbd8762da6639d 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 01 08:38:18 EDT 1994
+
+       * who.c: Add #ifdefs to build the `users' executable.
+       * src/Makefile.in: Add corresponding rules.
+       * Makefile.in (PROGS): Add users.
+       From Kaveh R. Ghazi <ghazi@noc.rutgers.edu>.
+       * users.1: Document it.
+
 Thu Apr 28 00:45:02 1994  Jim Meyering  (meyering@comco.com)
 
        * pwd.c: New program.

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index 3c470fbd398230b526b7a1b2e5ee55ead75c0fed..d327940b2d9121a8b112f053a87a07203130a241 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,5 +1,5 @@
 User visible changes in release 2.0
-* add pwd command
+* add pwd and users commands
 * --version outputs the name of the utility as well as the package name
   and version number.
 * Configure properly determines options for stty on SCO ODT 3.0 systems.