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

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

Module: performous
Branch: opengl2
Commit: 40bea45633758c4a9b526fd629e6c15c985fda21

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Jan 27 00:02:14 2011 +0100

Merge branch 'master' into opengl2

Conflicts:
	game/guitargraph.cc
	game/screen_songs.cc

---