Merge branch 'development/GPS'
authorToni Jussila <toni.jussila@fudeco.com>
Mon, 22 Mar 2010 12:28:52 +0000 (14:28 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Mon, 22 Mar 2010 12:28:52 +0000 (14:28 +0200)
commitdb5f8d85fd299de8e55129ef7e7c0ea5fa5d4790
tree7f299648eef7351efa73392dd99c3d6d443dd65d
parentc68f0fbb1f1163e51079e6829aa640ddbc81ac15
parentf1156b17c0735067d363a1dc6a6c0a5c3688ffcc
Merge branch 'development/GPS'
Client/carmainwindow.cpp
Client/carmainwindow.h