[hamradio-commits] [gnss-sdr] 184/251: Merge branch 'next' of git+ssh://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 a45e4bbdc4ce86b0a8ff310f1ba6911802dccf68
Merge: 2984ff9 69a7699
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Jun 28 09:24:36 2015 +0200

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

 ...e.conf => gnss-sdr_GPS_L2C_USRP1_realtime.conf} |  95 +++-
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |  36 +-
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |  22 +-
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf | 497 +++++++++++++++++++
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf | 547 +++++++++++++++++++++
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 351 +++----------
 .../signal_source/adapters/uhd_signal_source.cc    |   4 +-
 .../signal_source/adapters/uhd_signal_source.h     |   1 +
 .../adapters/galileo_e1b_telemetry_decoder.cc      |   5 +
 .../galileo_e1b_telemetry_decoder_cc.cc            |  24 +-
 .../galileo_e1b_telemetry_decoder_cc.h             |  10 +
 .../tracking/adapters/gps_l2_m_dll_pll_tracking.cc |   2 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |  53 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |  24 +-
 src/core/receiver/gnss_block_factory.cc            |   2 +-
 15 files changed, 1328 insertions(+), 345 deletions(-)

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