Date: Mon, 10 Nov 1997 10:31:36 -0800 (PST) From: Mark Murray <markm@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 Message-ID: <199711101831.KAA17270@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199711101831.KAA17270>