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

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

Module: performous
Branch: dance
Commit: c8668e3b113f4799c8dbfbe8763e188e4be12a6d

Author: Tapio Vierros <tap...@gm...>
Date:   Fri Dec 11 14:13:09 2009 +0200

Merge branch 'master' into dance

Conflicts:
	game/joystick.cc
	game/joystick.hh
	game/screen_sing.cc
	game/surface.cc
	libs/libda/plugins/CMakeLists.txt

---