[hamradio-commits] [gnss-sdr] 17/303: Merge remote-tracking branch 'cf/tong' into next

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 12739fccdd65577a07c720c8b81aac8df3e65944
Merge: 2499946 2a2344d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Aug 11 13:51:53 2016 +0200

    Merge remote-tracking branch 'cf/tong' into next

 .../galileo_e1_pcps_tong_ambiguous_acquisition.cc  |  3 ++-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.h   |  1 +
 .../adapters/gps_l1_ca_pcps_tong_acquisition.cc    |  3 ++-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.h     |  1 +
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    | 22 +++++++++++++---------
 .../gnuradio_blocks/pcps_tong_acquisition_cc.h     |  9 +++++----
 6 files changed, 24 insertions(+), 15 deletions(-)

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