Merge branch 'myTestBranch'
authorToni Jussila <toni.jussila@fudeco.com>
Tue, 9 Mar 2010 07:42:28 +0000 (09:42 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Tue, 9 Mar 2010 07:42:28 +0000 (09:42 +0200)
commit7eddd25d4c909ac6938335e25f53594912cfbf07
tree4c447d8f3262099487cb399a0509a98036608528
parentb71f6b92868830778be9fa881c46acbf702c2c7d
parent979a3cc6635b35e58644a19489b5cde58a2fb022
Merge branch 'myTestBranch'
Client/carmainwindow.cpp
Client/carmainwindow.h
Client/measuredialog.cpp