Conflict solved: mainwindow.cpp and calculate.cpp
authorToni Jussila <toni.jussila@gmail.com>
Fri, 28 May 2010 12:09:17 +0000 (15:09 +0300)
committerToni Jussila <toni.jussila@gmail.com>
Fri, 28 May 2010 12:09:17 +0000 (15:09 +0300)
commit59a7180931986f4d9420f6b4f1beb85f078fd309
treee55d7d928951ec09c0202ce923175f48e6be65be
parenteb8665a8c4b6a15a9d5a9f5b348432293d171ae6
Conflict solved: mainwindow.cpp and calculate.cpp
32 files changed:
Client/accelerationstart.cpp
Client/accelerometer.cpp
Client/accrealtimedialog.cpp
Client/calculate.cpp
Client/calibratedialog.cpp
Client/categorylist.cpp
Client/creditsdialog.cpp
Client/custombutton.cpp
Client/filereader.cpp
Client/gpsdata.cpp
Client/helpaccelerationdialog.cpp
Client/helpdialog.cpp
Client/helpdialog.h
Client/helpresultsdialog.cpp
Client/helproutingdialog.cpp
Client/helpsettingsdialog.cpp
Client/httpclient.cpp
Client/instructionsdialog.cpp
Client/maemo5location.cpp
Client/maemo5locationprivate.cpp
Client/main.cpp
Client/mainwindow.cpp
Client/mainwindow.h
Client/movingaverage.cpp
Client/profiledialog.cpp
Client/registerdialog.cpp
Client/registerdialog.h
Client/resultdialog.cpp
Client/routedialog.cpp
Client/routesavedialog.cpp
Client/settingsdialog.cpp
Client/topresultdialog.cpp