Merge branch 'feature/popups'
authorTiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
Wed, 31 Mar 2010 10:12:10 +0000 (13:12 +0300)
committerTiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
Wed, 31 Mar 2010 10:12:10 +0000 (13:12 +0300)
commit899a98e19a7bc56b49fe7dc75195e24ada81d0b7
treefa533a01c4508ecb7d09cb09fa9f69c3b19a0439
parentaac224124a13e699b1880e3df8b2f1e116a662ee
parent9de94ffc9dac2ad13fda5703e58553737e1a0d42
Merge branch 'feature/popups'

Conflicts:
Client/mainwindow.cpp
Client/mainwindow.h
Client/accelerationstart.cpp
Client/accelerationstart.h
Client/mainwindow.cpp
Client/mainwindow.h
Client/resultdialog.cpp
Client/routedialog.cpp
Client/settingsdialog.cpp
Client/settingsdialog.h