From owner-cvs-all  Mon Sep 27  1:57: 7 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id EC77214F34; Mon, 27 Sep 1999 01:57:04 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Received: (from sheldonh@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id BAA72498;
	Mon, 27 Sep 1999 01:57:04 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Message-Id: <199909270857.BAA72498@freefall.freebsd.org>
From: Sheldon Hearn <sheldonh@FreeBSD.org>
Date: Mon, 27 Sep 1999 01:57:04 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/awk awk.h builtin.c eval.c field.c io.c
         main.c node.c src/contrib/awk/doc awk.1
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

sheldonh    1999/09/27 01:57:04 PDT

  Modified files:
    contrib/awk          awk.h builtin.c eval.c field.c io.c 
                         main.c node.c 
    contrib/awk/doc      awk.1 
  Log:
  Fix conflicts.  Add $FreeBSD$ as needed.
  
  Revision  Changes    Path
  1.5       +14 -2     src/contrib/awk/awk.h
  1.6       +86 -25    src/contrib/awk/builtin.c
  1.4       +58 -20    src/contrib/awk/eval.c
  1.4       +41 -27    src/contrib/awk/field.c
  1.4       +62 -43    src/contrib/awk/io.c
  1.4       +6 -4      src/contrib/awk/main.c
  1.4       +18 -15    src/contrib/awk/node.c
  1.5       +12 -5     src/contrib/awk/doc/awk.1



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message