Merge branch 'master' into laitiju
[situare] / src / ui / mainwindow.h