From owner-freebsd-commit  Sun Feb 11 22:45:54 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id WAA02372
          for freebsd-commit-outgoing; Sun, 11 Feb 1996 22:45:54 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id WAA02349
          for cvs-all-outgoing; Sun, 11 Feb 1996 22:45:50 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id WAA02337
          for cvs-gnu-outgoing; Sun, 11 Feb 1996 22:45:48 -0800 (PST)
Received: (from nate@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id WAA02328
          Sun, 11 Feb 1996 22:45:46 -0800 (PST)
Date: Sun, 11 Feb 1996 22:45:46 -0800 (PST)
From: Nate Williams <nate>
Message-Id: <199602120645.WAA02328@freefall.freebsd.org>
To: CVS-committers, cvs-gnu
Subject: cvs commit:  src/gnu/usr.bin/sort Makefile error.c getopt.c getopt.h getopt1.c long-options.c long-options.h sort.1 sort.c system.h version.c
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

nate        96/02/11 22:45:46

  Modified:    gnu/usr.bin/sort  Makefile error.c getopt.c getopt.h
                        getopt1.c long-options.c  long-options.h sort.1
                        sort.c system.h version.c
  Log:
  Merged in FreeBSD changes.
  
  Revision  Changes    Path
  1.4       +2 -7      src/gnu/usr.bin/sort/Makefile
  1.4       +64 -51    src/gnu/usr.bin/sort/error.c
  1.2       +141 -128  src/gnu/usr.bin/sort/getopt.c
  1.2       +6 -6      src/gnu/usr.bin/sort/getopt.h
  1.2       +2 -9      src/gnu/usr.bin/sort/getopt1.c
  1.3       +6 -14     src/gnu/usr.bin/sort/long-options.c
  1.2       +10 -1     src/gnu/usr.bin/sort/long-options.h
  1.5       +2 -2      src/gnu/usr.bin/sort/sort.1
  1.4       +623 -374  src/gnu/usr.bin/sort/sort.c
  1.5       +49 -46    src/gnu/usr.bin/sort/system.h
  1.2       +1 -11     src/gnu/usr.bin/sort/version.c