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

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

Module: performous
Branch: joinmenu
Commit: a5e395fde064c89588a393d577ace04a50ea4f11

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sun Jul 18 09:37:44 2010 +0300

Merge branch 'master' into portaudio

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

---