[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.6-59-g493fe0b

[Reinhard Arlt]

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  493fe0ba0770f382d99d514ed56edfb80f4f4207 (commit)
       via  5d089fb13f660403dfab4aa2d4637b43b577f880 (commit)
       via  b15fce1a9505cc2ae0bd5c003e3ec7fd95659204 (commit)
       via  f026c4ea132cfc1b0a98f103263569ce4d77e41e (commit)
       via  c7b5cfb15601dc533d5aaab1f73685bd1a7df571 (commit)
      from  b3a413d102c6edab0edd3b17eb8f053cb667c575 (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 493fe0ba0770f382d99d514ed56edfb80f4f4207
Merge: 5d089fb b3a413d
Author: Reinhard Arlt <address@hidden>
Date:   Wed May 30 16:13:03 2012 +0200

    Merge branch 'master' of git://git.sv.gnu.org/gpsd

commit 5d089fb13f660403dfab4aa2d4637b43b577f880
Merge: b15fce1 40cf0d6
Author: Reinhard Arlt <address@hidden>
Date:   Wed May 30 16:12:46 2012 +0200

    Fix merge.

commit b15fce1a9505cc2ae0bd5c003e3ec7fd95659204
Author: Reinhard Arlt <address@hidden>
Date:   Wed May 30 11:13:59 2012 +0200

    Do not activate pps subsystem for nmea2000.

commit f026c4ea132cfc1b0a98f103263569ce4d77e41e
Merge: c7b5cfb 0694cb4
Author: Reinhard Arlt <address@hidden>
Date:   Wed May 30 08:55:49 2012 +0200

    Merge branch 'master' of git://git.sv.gnu.org/gpsd

commit c7b5cfb15601dc533d5aaab1f73685bd1a7df571
Author: Bernd Zeimetz <address@hidden>
Date:   Tue May 29 13:26:26 2012 +0200

    Work around splint not knowing about multiarch.

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

Summary of changes:
 gpsd.c   |    2 +-
 ntpshm.c |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GPSD