Code

Merge branch 'GPSd'
authorNicolas JOURDEN <nicolas.jourden@laposte.net>
Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
committerNicolas JOURDEN <nicolas.jourden@laposte.net>
Tue, 17 Nov 2015 14:12:47 +0000 (15:12 +0100)
1  2 
configure.ac
src/Makefile.am
src/types.db

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/types.db
Simple merge