Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak] / Client / helpsettingsdialog.h
2010-04-19 Janne ÄnäkkäläAdded help for settings dialog.