From: Jim Meyering <jim@meyering.net>
Date: Sun, 1 May 1994 16:23:17 +0000 (+0000)
Subject: merge with 1.9.4j
X-Git-Tag: textutils-1_12_1~704
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd3061bed95fc14478e958c95fe3b53911e74890;p=thirdparty%2Fcoreutils.git

merge with 1.9.4j
---

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index be404b6879..23f4c63c68 100644
--- 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 3c470fbd39..d327940b2d 100644
--- 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.