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