Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak] / Client / registerdialog.ui
2010-05-27 Toni JussilaAdded new Register dialog.