From owner-cvs-all@FreeBSD.ORG Wed Sep 29 06:22:39 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F7A516A4CE; Wed, 29 Sep 2004 06:22:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3984A43D48; Wed, 29 Sep 2004 06:22:39 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8T6Mdvm046881; Wed, 29 Sep 2004 06:22:39 GMT (envelope-from trhodes@repoman.freebsd.org) Received: (from trhodes@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8T6Mdf6046880; Wed, 29 Sep 2004 06:22:39 GMT (envelope-from trhodes) Message-Id: <200409290622.i8T6Mdf6046880@repoman.freebsd.org> From: Tom Rhodes Date: Wed, 29 Sep 2004 06:22:39 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: BEGEMOT Subject: cvs commit: src/contrib/ngatm/sscop/ - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2004 06:22:39 -0000 trhodes 2004-09-29 06:22:39 UTC FreeBSD src repository src/contrib/ngatm/sscop/ - Imported sources Update of /home/ncvs/src/contrib/ngatm/sscop/ In directory repoman.freebsd.org:/tmp/cvs-serv46864 Log Message: Place files back on the vendor branch. Prodded by: ru Status: Vendor Tag: BEGEMOT Release Tags: NGATM_1_1_1 C src/contrib/ngatm/sscop//common.h C src/contrib/ngatm/sscop//common.c C src/contrib/ngatm/sscop//sscop_main.c 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jBEGEMOT:yesterday -jBEGEMOT src/contrib/ngatm/sscop/