Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak] / Client / custombutton.h
2010-04-22 Jukka KCustom button class added.