[Performous-commit] Lasse Kärkkäinen : Merge branch 'master' of performous.git.sourceforge.net:/gitroot/performous/editor

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

Author: Lasse Kärkkäinen <tronic+ndrm at trn.iki.fi>
Date:   Wed Feb 23 12:34:32 2011 +0100

Merge branch 'master' of performous.git.sourceforge.net:/gitroot/performous/editor

Conflicts:
	editorapp.cc

---