Merge branch 'development/carmainwindow'
authorToni Jussila <toni.jussila@fudeco.com>
Fri, 5 Mar 2010 12:32:01 +0000 (14:32 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Fri, 5 Mar 2010 12:32:01 +0000 (14:32 +0200)
1  2 
Client/carmainwindow.cpp
Client/carmainwindow.ui

Simple merge
Simple merge