Conflict
authorToni Jussila <toni.jussila@fudeco.com>
Fri, 16 Apr 2010 09:45:07 +0000 (12:45 +0300)
committerToni Jussila <toni.jussila@fudeco.com>
Fri, 16 Apr 2010 09:45:07 +0000 (12:45 +0300)
commit191e117d32d1e3e4865f51c84b3a2bbc565a49b3
tree0f0dfa7c7d08ba6fbc2502277a55916b47614b0d
parentef6573877133287171c02d2e7b1232ff44ab804e
Conflict
13 files changed:
Client/accelerationstart.cpp
Client/accelerationstart.h
Client/accrealtimedialog.cpp
Client/accrealtimedialog.h
Client/httpclient.cpp
Client/mainwindow.cpp
Client/mainwindow.h
Client/resultdialog.cpp
Client/resultdialog.h
Client/routedialog.cpp
Client/routedialog.h
Client/routesavedialog.cpp
Client/routesavedialog.h