Kimmo Varis 4ccdcf0fc2 Merge remote branch 'remotes/kimmo/loadable-project'
Conflicts:
	gui/gui.qrc
	gui/mainwindow.cpp
	gui/mainwindow.h
2010-08-24 20:37:51 +03:00
..