[hamradio-commits] [gnss-sdr] 156/251: Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit cc803ac49209bcfe9696b79792aa8a9822df82b4
Merge: 9d2e22e f56348d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri May 29 20:13:08 2015 +0200

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 .../gps_l2_m_telemetry_decoder_cc.cc               | 33 ++++++++++------------
 .../gps_l2_m_telemetry_decoder_cc.h                |  6 ++--
 src/core/system_parameters/GPS_L2C.h               | 14 +++++----
 .../gps_cnav_navigation_message.cc                 | 30 ++++++++++++++++++--
 .../gps_cnav_navigation_message.h                  |  3 +-
 5 files changed, 56 insertions(+), 30 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git