[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.14-407-gd302a71

[Eric S. Raymond]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GPSD".

The branch, master has been updated
       via  d302a714f3b3735062ce9c9fc6cdd9d0e74f43f6 (commit)
       via  6e4d38c2e4b117bc9ec6f4c6faf69655c970361c (commit)
      from  f493f9e0b633924d82d0bead651848b52a5d1f55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d302a714f3b3735062ce9c9fc6cdd9d0e74f43f6
Merge: 6e4d38c f493f9e
Author: Eric S. Raymond <address@hidden>
Date:   Mon Apr 13 18:02:06 2015 -0400

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gpsd
    
    Conflicts:
        gpscap.ini

commit 6e4d38c2e4b117bc9ec6f4c6faf69655c970361c
Author: Sanjeev Gupta <address@hidden>
Date:   Sun Apr 12 16:35:57 2015 +0800

    Add info for Sure OEM Board, works very well

-----------------------------------------------------------------------

Summary of changes:
 gpscap.ini     |    2 +-
 libgpsd_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GPSD