]> git.street.me.uk Git - andy/viking.git/commitdiff
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)
Resolve conflicts:
src/vikgpslayer.c

1  2 
configure.ac

diff --cc configure.ac
Simple merge