[hamradio-commits] [gnss-sdr] 198/251: 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 master
in repository gnss-sdr.

commit 392bb64ad93d3f83b96f4bbea1ef540b5c1cc486
Merge: 0dcdf00 0927394
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Jul 16 16:08:23 2015 +0200

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

 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             | 311 +++++++++++++++++++
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |  19 +-
 .../gnuradio_blocks/mixed_observables_cc.cc        |  70 +++--
 .../signal_source/adapters/CMakeLists.txt          |   3 +-
 .../adapters/two_bit_cpx_file_signal_source.cc     | 337 +++++++++++++++++++++
 .../adapters/two_bit_cpx_file_signal_source.h      | 128 ++++++++
 .../signal_source/gnuradio_blocks/CMakeLists.txt   |   1 +
 .../unpack_byte_2bit_cpx_samples.cc                | 104 +++++++
 .../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h |  64 ++++
 src/core/receiver/gnss_block_factory.cc            |  16 +
 10 files changed, 1009 insertions(+), 44 deletions(-)

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