[Performous-commit] Lasse Karkkainen : Merge branch 'master' of ssh://zi.fi/performous

[knittl <kn...@us...>]

Module: performous
Branch: master
Commit: a7a5cb4d1eee8eab2718697eab4133b37fc1ce33

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Aug  1 16:42:31 2009 +0300

Merge branch 'master' of ssh://zi.fi/performous

Conflicts:
	game/joystick.hh

---