divers
Merge branch 'essai-qt' of https://github.com/mael65/climso-auto.git
into essai-qt

Conflicts:
	src/Makefile.in