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

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

Module: performous
Branch: joinmenu
Commit: 946c2c09a98dd899e734360d2a71a6269c70fd5e

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Jun 18 01:39:52 2010 +0300

Merge branch 'master' into portaudio

Conflicts:
	game/screen_sing.hh
	libs/libda/plugins/alsa/alsa.hpp

---