]> git.street.me.uk Git - andy/viking.git/commit
Merge branch 'master' into GPSD-API-v5
authorRob Norris <rw_norris@hotmail.com>
Sat, 12 Nov 2011 23:08:56 +0000 (23:08 +0000)
committerRob Norris <rw_norris@hotmail.com>
Sun, 13 Nov 2011 09:35:08 +0000 (09:35 +0000)
commit41020f9d846a22585d277e92ef079d0e1dc1aa9d
treef51efe6cbb0b3f101ccf382ac7da75d49cc29633
parent3604ba68161be2b42d08e6154c0a3352ec01d1de
parent76b8a4e8b29bcb54d0db217fb364149befab400b
Merge branch 'master' into GPSD-API-v5

Resolve conflicts:
src/vikgpslayer.c
configure.ac