[hamradio-commits] [gnss-sdr] 04/07: 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 1c7fb64b675b8d6860164ef5346dcd91a99c6665
Merge: 7fd3a36 4882398
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Apr 26 19:20:12 2016 +0200

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

 README.md                                          |  4 +--
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |  5 ++-
 src/algorithms/channel/adapters/channel.cc         | 12 +++----
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 38 +++++++++++++-------
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |  2 ++
 src/tests/test_main.cc                             |  1 -
 src/utils/front-end-cal/main.cc                    | 41 ++++++++++++----------
 7 files changed, 59 insertions(+), 44 deletions(-)

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