[Performous-commit] Lasse Karkkainen : Merge branch 'portaudio'

[Yoda-JM <yo...@us...>]

Module: performous
Branch: joinmenu
Commit: 5bac66a8438f845bc1048ce319d6281944d43a47

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Aug 13 01:44:19 2010 +0300

Merge branch 'portaudio'

Conflicts:
	libs/libda/plugins/audio_dev_alsa.cpp
	libs/libda/plugins/audio_dev_pa19.cpp

---