[hamradio-commits] [gnss-sdr] 122/251: Merge branch 'next' of https://github.com/carlesfernandez/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 01eb6ae9cf389df1c1300cbd117e15e1847d8f7d
Merge: 0fcf29a 52d1bbb
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri May 22 18:55:54 2015 +0200

    Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

 src/algorithms/channel/libs/channel_fsm.cc         |  2 +-
 .../gnuradio_blocks/rtl_tcp_signal_source_c.cc     |  2 +-
 .../adapters/sbas_l1_telemetry_decoder.cc          |  1 +
 .../sbas_l1_telemetry_decoder_cc.cc                |  1 +
 src/core/libs/gnss_sdr_supl_client.cc              | 11 +++++-
 src/core/system_parameters/gps_cnav_ephemeris.cc   | 41 +--------------------
 src/core/system_parameters/gps_cnav_ephemeris.h    | 43 ++++++++++------------
 src/tests/test_main.cc                             |  7 ++--
 8 files changed, 37 insertions(+), 71 deletions(-)

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