[hamradio-commits] [gnss-sdr] 04/06: Merge branch 'next' of https://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 next
in repository gnss-sdr.

commit 612e2f8170dd492a5a58642f89f3b96047ac1c38
Merge: 64d75ec 0eaea3d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Feb 5 20:32:49 2017 +0100

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

 conf/gnss-sdr.conf                                 |   2 +-
 src/tests/CMakeLists.txt                           |   2 +-
 src/tests/system-tests/obs_gps_l1_system_test.cc   |   8 -
 .../signal-processing-blocks/libs/CMakeLists.txt   |   2 +-
 .../libs/tlm_dump_reader.cc                        |   8 +-
 .../libs/tlm_dump_reader.h                         |  12 +-
 .../libs/tracking_dump_reader.cc                   |  10 +-
 .../libs/tracking_dump_reader.h                    |  12 +-
 .../libs/tracking_true_obs_reader.h                |  12 +-
 .../gps_l1_ca_telemetry_decoder_test.cc            | 110 ++++-----
 .../tracking/gps_l1_ca_dll_pll_tracking_test.cc    | 247 ++++++++++-----------
 11 files changed, 190 insertions(+), 235 deletions(-)

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