Conflict fixed: mainwindow.cpp and httpclient.cpp
authorToni Jussila <toni.jussila@fudeco.com>
Thu, 22 Apr 2010 07:02:44 +0000 (10:02 +0300)
committerToni Jussila <toni.jussila@fudeco.com>
Thu, 22 Apr 2010 07:02:44 +0000 (10:02 +0300)
commitac84b058f9433e99aee2f560ef4f4e634d6900f7
treed02ac6c2550fe10871cd040e4360164c2bea8a54
parente753d97cfeafbe574fbd6f51c4f06dfebd0141e4
Conflict fixed: mainwindow.cpp and httpclient.cpp
17 files changed:
Client/categorylist.cpp
Client/gpsdata.cpp
Client/httpclient.cpp
Client/httpclient.h
Client/maemo5location.cpp
Client/maemo5locationprivate.cpp
Client/mainwindow.cpp
Client/resultdialog.cpp
Client/resultdialog.h
Client/resultdialog.ui
Client/routedialog.cpp
Client/routedialog.h
Client/routedialog.ui
Client/routesavedialog.cpp
Client/speedfreak.pro
Client/xmlreader.cpp
Client/xmlwriter.cpp