From owner-cvs-user  Fri Jun 21 10:29:30 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id KAA27121
          for cvs-user-outgoing; Fri, 21 Jun 1996 10:29:30 -0700 (PDT)
Received: (from markm@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id KAA27064;
          Fri, 21 Jun 1996 10:29:17 -0700 (PDT)
Date: Fri, 21 Jun 1996 10:29:17 -0700 (PDT)
From: Mark Murray <markm>
Message-Id: <199606211729.KAA27064@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/secure Makefile Makefile.inc src/secure/bin Makefile Makefile.inc src/secure/bin/ed Makefile src/secure/lib Makefile src/secure/lib/libcrypt Makefile src/secure/lib/libtelnet Makefile src/secure/libexec/telnetd Makefile sys_term.c utility.c src/secure/usr.bin Makefile src/secure/usr.bin/bdes Makefile bdes.1 src/secure/libexec Makefile src/secure/usr.bin/telnet Makefile krb4-proto.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

markm       96/06/21 10:29:16

  Branch:      secure    RELENG_2_1_0
               secure/bin  RELENG_2_1_0
               secure/bin/ed  RELENG_2_1_0
               secure/lib  RELENG_2_1_0
               secure/lib/libcrypt  RELENG_2_1_0
               secure/lib/libtelnet  RELENG_2_1_0
               secure/libexec  RELENG_2_1_0
               secure/libexec/telnetd  RELENG_2_1_0
               secure/usr.bin  RELENG_2_1_0
               secure/usr.bin/bdes  RELENG_2_1_0
               secure/usr.bin/telnet  RELENG_2_1_0
  Modified:    secure    Makefile Makefile.inc
               secure/lib  Makefile
               secure/lib/libcrypt  Makefile
               secure/lib/libtelnet  Makefile
               secure/libexec/telnetd  Makefile sys_term.c utility.c
               secure/usr.bin  Makefile
               secure/usr.bin/bdes  Makefile bdes.1
               secure/usr.bin/telnet  Makefile
  Removed:     secure/bin  Makefile Makefile.inc
               secure/bin/ed  Makefile
               secure/libexec  Makefile
               secure/usr.bin/telnet  krb4-proto.h
  Log:
  Merge with HEAD
  
  Revision  Changes    Path
  1.6.4.2   +28 -3     src/secure/Makefile
  1.6.4.3   +2 -2      src/secure/Makefile.inc
  1.2.6.2   +2 -2      src/secure/lib/Makefile
  1.7.6.2   +2 -1      src/secure/lib/libcrypt/Makefile
  1.1.1.1.6.4 +10 -46    src/secure/lib/libtelnet/Makefile
  1.2.6.5   +6 -36     src/secure/libexec/telnetd/Makefile
  1.2.4.3   +1 -2      src/secure/libexec/telnetd/sys_term.c
  1.2.4.2   +10 -0     src/secure/libexec/telnetd/utility.c
  1.1.6.2   +2 -2      src/secure/usr.bin/Makefile
  1.5.4.1   +9 -3      src/secure/usr.bin/bdes/Makefile
  1.1.6.1   +1 -1      src/secure/usr.bin/bdes/bdes.1
  1.1.1.1.6.5 +9 -44     src/secure/usr.bin/telnet/Makefile