[hamradio-commits] [gnss-sdr] 64/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 7b562e868693512bd5dfb03af1f30ed44a96d240
Merge: 59f6b2b 1bafa1e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Feb 26 12:46:36 2016 +0100

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

 conf/gnss-sdr_Hybrid_byte_sim.conf                 |   5 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |   3 +-
 .../galileo_e1_pcps_ambiguous_acquisition.h        |   1 +
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |   5 +-
 .../adapters/gps_l1_ca_pcps_acquisition.h          |   1 +
 .../adapters/gps_l2_m_pcps_acquisition.cc          |   3 +-
 .../adapters/gps_l2_m_pcps_acquisition.h           |   1 +
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |  55 ++++++--
 .../gnuradio_blocks/pcps_acquisition_cc.h          |  10 +-
 .../gnuradio_blocks/pcps_acquisition_sc.cc         |  75 ++++++----
 .../gnuradio_blocks/pcps_acquisition_sc.h          |  13 +-
 .../volk_gnsssdr/CMakeLists.txt                    |  40 +++---
 .../volk_gnsssdr_module/volk_gnsssdr/Doxyfile.in   |   6 +-
 .../volk_gnsssdr/apps/CMakeLists.txt               |  12 +-
 .../volk_gnsssdr/cmake/Modules/VolkPython.cmake    |  10 +-
 .../volk_gnsssdr/cmake/Modules/VolkVersion.cmake   |   4 +-
 .../volk_gnsssdr/lib/CMakeLists.txt                |  50 +++----
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         | 151 +++++++--------------
 .../galileo_e1_dll_pll_veml_tracking_cc.h          |  18 +--
 19 files changed, 235 insertions(+), 228 deletions(-)

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