Merge branch 'feature/XMLreader'
authorToni Jussila <toni.jussila@gmail.com>
Fri, 5 Mar 2010 09:23:13 +0000 (11:23 +0200)
committerToni Jussila <toni.jussila@gmail.com>
Fri, 5 Mar 2010 09:23:13 +0000 (11:23 +0200)
commit39d7f4c4a512b62dac0f777385af70f18f8bcedd
treeedb25f4a80e304b3d2229943f55b4f66a00ac610
parent67d43ca29d2e4165caf0f6f8b637d71ab98281a0
parentec2e343485c22d0c34a63e0d0512dbb642a8a4c4
Merge branch 'feature/XMLreader'

Conflicts:
Client/UI.pro
Client/carmainwindow.cpp
Client/carmainwindow.h
Client/carmainwindow.ui
Client/UI.pro
Client/carmainwindow.cpp
Client/carmainwindow.h
Client/carmainwindow.ui