[hamradio-commits] [gnss-sdr] 94/149: Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr into new_volk_module

[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 7e11a6ef729c033ea848e8f8ce2096b3bf4f77b0
Merge: 497c856 bb39ff4
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Jan 20 18:40:27 2016 +0100

    Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr
    into new_volk_module
    
    # 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.

 src/algorithms/acquisition/adapters/CMakeLists.txt |   1 +
 .../adapters/gps_l1_ca_pcps_acquisition.cc         | 184 ++++----
 .../adapters/gps_l1_ca_pcps_acquisition.h          |   3 +
 .../acquisition/gnuradio_blocks/CMakeLists.txt     |   4 +-
 .../gnuradio_blocks/pcps_acquisition_sc.cc         | 472 +++++++++++++++++++++
 .../gnuradio_blocks/pcps_acquisition_sc.h          | 244 +++++++++++
 6 files changed, 836 insertions(+), 72 deletions(-)

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