Version
Merge branch 'master' of github.com:mveinot/QtCBM

Conflicts:
	version.h
Change makefile to make static lib building more cross platform