From owner-cvs-sys  Mon Nov 10 10:35:39 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id KAA18255
          for cvs-sys-outgoing; Mon, 10 Nov 1997 10:35:39 -0800 (PST)
          (envelope-from owner-cvs-sys)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id KAA18147;
          Mon, 10 Nov 1997 10:33:37 -0800 (PST)
          (envelope-from markm@FreeBSD.org)
From: Mark Murray <markm@FreeBSD.ORG>
Received: (from markm@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id KAA17270;
	Mon, 10 Nov 1997 10:31:36 -0800 (PST)
Date: Mon, 10 Nov 1997 10:31:36 -0800 (PST)
Message-Id: <199711101831.KAA17270@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/i386/isa/sound ad1848.c audio.c dmabuf.c
         gus_wave.c local.h midibuf.c os.h sequencer.c sound_calls.h
         soundcard.c sscape.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

markm       1997/11/10 10:31:36 PST

  Modified files:
    sys/i386/isa/sound   ad1848.c audio.c dmabuf.c gus_wave.c 
                         local.h midibuf.c os.h sequencer.c 
                         sound_calls.h soundcard.c sscape.c 
  Log:
  Fix conflicts.
  
  Revision  Changes    Path
  1.17      +15 -39    src/sys/i386/isa/sound/ad1848.c
  1.15      +9 -4      src/sys/i386/isa/sound/audio.c
  1.29      +11 -2     src/sys/i386/isa/sound/dmabuf.c
  1.24      +2 -2      src/sys/i386/isa/sound/gus_wave.c
  1.27      +7 -4      src/sys/i386/isa/sound/local.h
  1.16      +33 -0     src/sys/i386/isa/sound/midibuf.c
  1.35      +1 -1      src/sys/i386/isa/sound/os.h
  1.19      +36 -1     src/sys/i386/isa/sound/sequencer.c
  1.22      +1 -1      src/sys/i386/isa/sound/sound_calls.h
  1.57      +22 -17    src/sys/i386/isa/sound/soundcard.c
  1.4       +3 -1      src/sys/i386/isa/sound/sscape.c