[hamradio-commits] [gnss-sdr] 43/251: Merge branch 'multisignals' of https://github.com/gnss-sdr/gnss-sdr into multisignals

[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 74d437a709d6197c724ce0a27bf54f84aa2f1d6a
Merge: 8cf78f0 6d3f1cc
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu May 7 22:44:04 2015 +0200

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

 conf/gnss-sdr_Hybrid_byte.conf                     | 16 ++++++++-
 conf/gnss-sdr_Hybrid_nsr.conf                      | 17 ++++++++-
 conf/gnss-sdr_Hybrid_short.conf                    | 10 +++++-
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |  9 ++---
 src/algorithms/libs/gps_l2c_signal.cc              | 28 ++++++++-------
 src/core/receiver/gnss_block_factory.cc            | 34 +++++++++---------
 src/core/receiver/gnss_block_factory.h             |  2 +-
 src/core/receiver/gnss_flowgraph.cc                | 40 +++++++++-------------
 src/core/system_parameters/GPS_L2C.h               | 20 +++++------
 .../gnss_block/gps_l2_m_pcps_acquisition_test.cc   |  2 +-
 10 files changed, 102 insertions(+), 76 deletions(-)


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