From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Edrza-0006qJ-UJ
	for qemu-devel@nongnu.org; Sun, 20 Nov 2005 11:24:39 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Edrza-0006pX-4a
	for qemu-devel@nongnu.org; Sun, 20 Nov 2005 11:24:38 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EdrzW-0006pK-Vo
	for qemu-devel@nongnu.org; Sun, 20 Nov 2005 11:24:37 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EdrzW-0003Ow-WD
	for qemu-devel@nongnu.org; Sun, 20 Nov 2005 11:24:35 -0500
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EdrzW-0002Df-00
	for <qemu-devel@nongnu.org>; Sun, 20 Nov 2005 11:24:34 -0500
From: Fabrice Bellard <fabrice@bellard.org>
Message-Id: <E1EdrzW-0002Df-00@savannah.gnu.org>
Date: Sun, 20 Nov 2005 11:24:34 -0500
Subject: [Qemu-devel] qemu/audio alsaaudio.c audio.c audio.h audio_in...
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

CVSROOT:	/cvsroot/qemu
Module name:	qemu
Branch: 	
Changes by:	Fabrice Bellard <bellard@savannah.gnu.org>	05/11/20 16:24:34

Modified files:
	audio          : alsaaudio.c audio.c audio.h audio_int.h 
	                 audio_template.h ossaudio.c 

Log message:
	audio merge (malc)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/alsaaudio.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/audio.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/audio.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/audio_int.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/audio_template.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/audio/ossaudio.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text