git.maemo.org Git - speedfreak/commit

projects / speedfreak / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 851f8d2 431e1a4)

author	Toni Jussila <toni.jussila@fudeco.com>
	Thu, 18 Mar 2010 10:40:40 +0000 (12:40 +0200)
committer	Toni Jussila <toni.jussila@fudeco.com>
	Thu, 18 Mar 2010 10:40:40 +0000 (12:40 +0200)
commit	a29fd4aabf9f71d8e5148a58372b9bee6d7ac6f8
tree	826d6e1902367c0ae1ec0855969c788bda6ec264	tree \| snapshot
parent	851f8d2a906cfabfd0fb57a5e41732c1bda41cfe	commit \| diff
parent	431e1a47738b2f723789de366eead08c4e2b5fd2	commit \| diff

Added feature: GPS on/off and checks if at least 4 satellites is in use.

Merge branch 'development/GPS'

Conflicts:
Client/carmainwindow.cpp
Client/carmainwindow.h

Client/carmainwindow.cpp	diff1 \|	diff2 \|	blob \| history
Client/carmainwindow.h	diff1 \|	diff2 \|	blob \| history
Client/carmainwindow.ui	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.