From owner-cvs-lib  Sun Jun 23 19:32:28 1996
Return-Path: owner-cvs-lib
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA14363
          for cvs-lib-outgoing; Sun, 23 Jun 1996 19:32:28 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA14160;
          Sun, 23 Jun 1996 19:30:43 -0700 (PDT)
Date: Sun, 23 Jun 1996 19:30:43 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199606240230.TAA14160@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-lib
Subject: cvs commit:  src/lib/libftpio ftp_pkg.c ftpio.3 ftpio.c ftpio.h
Sender: owner-cvs-lib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/06/23 19:30:40

  Branch:      lib/libftpio  RELENG_2_1_0
  Modified:    lib/libftpio  ftp_pkg.c ftpio.3 ftpio.c ftpio.h
  Log:
  Merge with HEAD
  
  Revision  Changes    Path
  1.1.1.1.2.1 +4 -4      src/lib/libftpio/ftp_pkg.c
  1.4.2.2   +8 -4      src/lib/libftpio/ftpio.3
  1.4.2.2   +73 -38    src/lib/libftpio/ftpio.c
  1.2.2.1   +5 -4      src/lib/libftpio/ftpio.h