From owner-cvs-src@FreeBSD.ORG Thu Aug 31 14:14:32 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C59BA16A4E1; Thu, 31 Aug 2006 14:14:32 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38CA043D5F; Thu, 31 Aug 2006 14:14:31 +0000 (GMT) (envelope-from ru@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7VEEVmL048751; Thu, 31 Aug 2006 14:14:31 GMT (envelope-from ru@repoman.freebsd.org) Received: (from ru@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7VEEVkx048750; Thu, 31 Aug 2006 14:14:31 GMT (envelope-from ru) Message-Id: <200608311414.k7VEEVkx048750@repoman.freebsd.org> From: Ruslan Ermilov Date: Thu, 31 Aug 2006 14:14:30 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/usr.bin/tip/libacu biz22.c biz31.c courier.c df.c dn11.c hayes.c t3000.c v3451.c v831.c ventel.c src/usr.bin/tip/tip Makefile acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c pathnames.h remote.c tip.1 tip.c tip.h tipout.c uucplock.c value.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2006 14:14:32 -0000 ru 2006-08-31 14:14:30 UTC FreeBSD src repository Modified files: usr.bin/tip/libacu biz22.c biz31.c courier.c df.c dn11.c hayes.c t3000.c v3451.c v831.c ventel.c usr.bin/tip/tip Makefile acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c pathnames.h remote.c tip.1 tip.c tip.h tipout.c uucplock.c value.c vars.c Log: Resolve merge conflicts. Revision Changes Path 1.3 +25 -36 src/usr.bin/tip/libacu/biz22.c 1.3 +28 -31 src/usr.bin/tip/libacu/biz31.c 1.7 +39 -43 src/usr.bin/tip/libacu/courier.c 1.4 +15 -27 src/usr.bin/tip/libacu/df.c 1.4 +12 -18 src/usr.bin/tip/libacu/dn11.c 1.5 +30 -37 src/usr.bin/tip/libacu/hayes.c 1.6 +49 -51 src/usr.bin/tip/libacu/t3000.c 1.3 +17 -28 src/usr.bin/tip/libacu/v3451.c 1.4 +19 -27 src/usr.bin/tip/libacu/v831.c 1.5 +38 -48 src/usr.bin/tip/libacu/ventel.c 1.19 +4 -5 src/usr.bin/tip/tip/Makefile 1.8 +10 -17 src/usr.bin/tip/tip/acu.c 1.6 +19 -23 src/usr.bin/tip/tip/acutab.c 1.17 +159 -123 src/usr.bin/tip/tip/cmds.c 1.6 +3 -7 src/usr.bin/tip/tip/cmdtab.c 1.6 +48 -28 src/usr.bin/tip/tip/cu.c 1.7 +10 -14 src/usr.bin/tip/tip/hunt.c 1.6 +5 -11 src/usr.bin/tip/tip/log.c 1.5 +3 -7 src/usr.bin/tip/tip/partab.c 1.6 +2 -6 src/usr.bin/tip/tip/pathnames.h 1.6 +18 -20 src/usr.bin/tip/tip/remote.c 1.25 +202 -259 src/usr.bin/tip/tip/tip.1 1.17 +101 -116 src/usr.bin/tip/tip/tip.c 1.11 +89 -74 src/usr.bin/tip/tip/tip.h 1.11 +31 -25 src/usr.bin/tip/tip/tipout.c 1.7 +13 -19 src/usr.bin/tip/tip/uucplock.c 1.10 +35 -57 src/usr.bin/tip/tip/value.c 1.7 +10 -8 src/usr.bin/tip/tip/vars.c