From owner-cvs-lib  Wed Jul  3 22:47:44 1996
Return-Path: owner-cvs-lib
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id WAA02351
          for cvs-lib-outgoing; Wed, 3 Jul 1996 22:47:44 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id WAA02329;
          Wed, 3 Jul 1996 22:47:34 -0700 (PDT)
Date: Wed, 3 Jul 1996 22:47:34 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199607040547.WAA02329@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-lib
Subject: cvs commit:  src/lib/libftpio Makefile ftpio.3 ftpio.c ftpio.h
Sender: owner-cvs-lib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/07/03 22:47:33

  Branch:      lib/libftpio  RELENG_2_1_0
  Modified:    lib/libftpio  Makefile ftpio.3 ftpio.c ftpio.h
  Log:
  Merge from HEAD
  
  Revision  Changes    Path
  1.1.1.1.2.1 +1 -1      src/lib/libftpio/Makefile
  1.4.2.3   +9 -0      src/lib/libftpio/ftpio.3
  1.4.2.3   +10 -1     src/lib/libftpio/ftpio.c
  1.2.2.3   +3 -1      src/lib/libftpio/ftpio.h