Merge branch 'GPSd'

author Nicolas JOURDEN <nicolas.jourden@laposte.net>

Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)

committer Nicolas JOURDEN <nicolas.jourden@laposte.net>

Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
author Nicolas JOURDEN <nicolas.jourden@laposte.net>
Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
committer Nicolas JOURDEN <nicolas.jourden@laposte.net>
Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/types.db
Simple merge
author	Nicolas JOURDEN <nicolas.jourden@laposte.net>
	Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
committer	Nicolas JOURDEN <nicolas.jourden@laposte.net>
	Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history