now compiles again

Merge branch 'master' into gl

Merge branch 'master' into gl

- moved the uncolorize action to the color toolbar, renamed to uncolor

- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.

- renamed some cmake identifiers

(0) -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 tip

mercurial