Merge branch 't/nonblock_api'
authorAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
1  2 
audiod.c
error.h

diff --cc audiod.c
Simple merge
diff --cc error.h
Simple merge