Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak] / Client / usersdialog.h
2010-05-27 Janne ÄnäkkäläAdded error handling to listing of users and showing...
2010-05-26 Janne ÄnäkkäläUsers dialog files added.