[hamradio-commits] [gnss-sdr] 236/236: 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 7fd3a36121b7d5b7cb8fe2b07e4f15224aa97314
Merge: 32e0117 ec4dd37
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Apr 26 18:00:31 2016 +0200

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

 MANIFEST.md                                        |   3 +-
 README.md                                          |  19 +-
 conf/gnss-sdr_Hybrid_nsr_bak.conf                  | 345 ---------------------
 conf/gnss-sdr_Hybrid_short.conf                    |  10 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc       | 110 +------
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.h        |   3 -
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |  53 +---
 src/algorithms/PVT/adapters/hybrid_pvt.h           |   3 -
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |   7 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |   8 -
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |  33 +-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   8 -
 src/algorithms/channel/adapters/channel.cc         |  27 +-
 src/algorithms/channel/adapters/channel.h          |   2 +-
 .../channel/libs/channel_msg_receiver_cc.cc        |  71 +++--
 .../channel/libs/channel_msg_receiver_cc.h         |   4 +-
 .../volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h  |  58 +++-
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h  |   2 +-
 .../volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h   |   4 +-
 .../volk_gnsssdr_s32f_sincospuppet_32fc.h          |   4 +-
 src/core/libs/gnss_sdr_supl_client.cc              |  22 +-
 src/core/receiver/control_thread.cc                | 122 ++++++--
 src/core/receiver/control_thread.h                 |   8 +-
 src/tests/control_thread/control_thread_test.cc    |  44 ++-
 src/tests/flowgraph/gnss_flowgraph_test.cc         |  30 +-
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |  65 ++++
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |  98 +++---
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |   2 +-
 src/tests/gnss_block/gnss_block_factory_test.cc    |  10 +-
 .../gnss_block/gps_l1_ca_pcps_acquisition_test.cc  | 107 ++++---
 .../gnss_block/gps_l2_m_dll_pll_tracking_test.cc   |  72 ++++-
 .../gnss_block/gps_l2_m_pcps_acquisition_test.cc   | 106 ++++---
 src/tests/test_main.cc                             |  11 +-
 src/utils/front-end-cal/main.cc                    |  59 ++++
 34 files changed, 665 insertions(+), 865 deletions(-)

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