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

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 7f84b2564cbb30139934671342314c0b265b9ee2

Author: Tapio Vierros <tap...@gm...>
Date:   Sun May 16 19:28:41 2010 +0300

Merge branch 'master' into instrumentgraph

Conflicts:
	game/dancegraph.hh
	game/guitargraph.cc
	game/guitargraph.hh

---