[Geany-devel] Build-system merge

[Lex Trotman]

Hi All,

I've merged trunk r4100 into the build-system branch, checked it
builds and runs and committed it back to build-system

Do you want to reintegrate it into the trunk before any more changes
are made to trunk that can upset the process?

The only conflicts are geany.html, but that should be re-generated
anyway and ChangeLog which I manually edited to accept all changes.
Of course its out of date order now, but that can be fixed by a script
when its in trunk (if it matters.)

Cheers
Lex