[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-oss [import]

[Steve Kowalik]

    Date: Monday, September 20, 2004 @ 05:31:46
  Author: stevenk
    Path: /cvsroot/pkg-alsa/debian/alsa-oss

Imported upstream version 1.0.6. 

Status:

Vendor Tag:	source-dist
Release Tags:	upstream_version_1_0_6
		
U debian/alsa-oss/COPYING
U debian/alsa-oss/Makefile.am
U debian/alsa-oss/Makefile.in
U debian/alsa-oss/aclocal.m4
U debian/alsa-oss/compile
C debian/alsa-oss/config.guess
C debian/alsa-oss/config.sub
U debian/alsa-oss/configure
U debian/alsa-oss/configure.in
U debian/alsa-oss/depcomp
U debian/alsa-oss/install-sh
U debian/alsa-oss/ltmain.sh
U debian/alsa-oss/missing
U debian/alsa-oss/mkinstalldirs
U debian/alsa-oss/alsa/Makefile.am
U debian/alsa-oss/alsa/Makefile.in
U debian/alsa-oss/alsa/alsa-local.h
U debian/alsa-oss/alsa/alsa-oss-emul.h
U debian/alsa-oss/alsa/alsa-oss.c
U debian/alsa-oss/alsa/aoss.1
U debian/alsa-oss/alsa/aoss.in
U debian/alsa-oss/alsa/mixer.c
U debian/alsa-oss/alsa/pcm.c
N debian/alsa-oss/alsa/stdioemu.c
U debian/alsa-oss/alsa/testaoss.in
U debian/alsa-oss/oss-redir/Makefile.am
U debian/alsa-oss/oss-redir/Makefile.in
U debian/alsa-oss/oss-redir/README
U debian/alsa-oss/oss-redir/oss-redir.c
U debian/alsa-oss/oss-redir/oss-redir.h
U debian/alsa-oss/test/Makefile.am
U debian/alsa-oss/test/Makefile.in
U debian/alsa-oss/test/lmixer.cc
U debian/alsa-oss/test/mixctl.h
U debian/alsa-oss/test/osstest.c
U debian/alsa-oss/test/testaoss.in

2 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jsource-dist:yesterday -jsource-dist debian/alsa-oss