[Performous-commit] Tapio Vierros : Merge branch 'master' into portaudio

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

Module: performous
Branch: joinmenu
Commit: fcd25d5a9b71be47c5f99612ae794e2f51241b47

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Aug 12 17:17:07 2010 +0300

Merge branch 'master' into portaudio

Conflicts:
	game/audio.cc
	game/audio.hh
	game/main.cc
	game/screen_practice.cc

---