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

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: dance
Commit: 5057b438e594ae40149ad65a683f2951681bccc0

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 14 20:41:29 2009 +0200

Merge branch 'master' into dance

A difficult merge due to major changes in master. Seems to be working fine, but be prepared for strange automerge results.

Conflicts:
	game/screen_sing.hh
	game/screen_songs.cc

---