- Merge ../ldforge into gl

- Merge ../ldforge into gl

- now compiles again

- Merge commit '5c835eb' into HEAD

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

- now compiles with clang

- doubled buffer sizes in updaterevision to prevent GIT_HASH from being truncated

- some tweaks to version.cc

- generate gitinfo.h in the build directory, not source directory. made ldforge depend on revision_check properly

(0) -300 -100 -14 +14 +100 +300 tip

mercurial