[Performous-commit] Lasse Karkkainen : Merge branch 'master' of ssh://git.performous.org/ gitroot/performous/performous

[Johnny O. <js...@us...>]

Module: performous
Branch: opengl2
Commit: 50646b66f65efb68dceb649c28126fa7fc8571de

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sun Oct 24 21:29:16 2010 +0200

Merge branch 'master' of ssh://git.performous.org/gitroot/performous/performous
Removing screenshot spammer.

Conflicts:
	game/main.cc

---