[hamradio-commits] [gnss-sdr] 05/06: 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 86d4221786862a4c97e3e54fea518ed2d6d75e5a
Merge: 6f55898 51e9a34
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun May 15 23:08:35 2016 +0200

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

 CMakeLists.txt                                         |  4 ++--
 conf/front-end-cal.conf                                | 14 ++++++++------
 conf/gnss-sdr.conf                                     |  7 -------
 conf/gnss-sdr_GPS_L1_GN3S_realtime.conf                |  2 --
 conf/gnss-sdr_GPS_L1_SPIR.conf                         |  5 +----
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf           |  6 +++---
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf                |  6 +++---
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf                |  5 +----
 conf/gnss-sdr_GPS_L1_gr_complex.conf                   |  4 +---
 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf               |  4 +---
 conf/gnss-sdr_GPS_L1_ishort.conf                       |  2 +-
 conf/gnss-sdr_GPS_L1_nsr.conf                          |  6 +++---
 conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf            |  6 +++---
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf             |  4 ++--
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf              |  4 ++--
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf                 |  6 +++---
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf              |  4 ++--
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf          |  7 +++----
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf       |  4 +---
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf            |  5 -----
 conf/gnss-sdr_Galileo_E1_ishort.conf                   |  3 ---
 conf/gnss-sdr_Galileo_E1_nsr.conf                      |  4 +---
 conf/gnss-sdr_Galileo_E5a.conf                         |  6 +++---
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf               |  7 +++----
 conf/gnss-sdr_Hybrid_byte.conf                         |  5 +----
 conf/gnss-sdr_Hybrid_byte_sim.conf                     |  5 +----
 conf/gnss-sdr_Hybrid_gr_complex.conf                   |  5 +----
 conf/gnss-sdr_Hybrid_ishort.conf                       |  6 ++----
 conf/gnss-sdr_Hybrid_nsr.conf                          |  4 +---
 ..._multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |  7 +++----
 ..._multichannel_GPS_L1_Flexiband_realtime_III_1a.conf |  4 ++--
 ..._multichannel_GPS_L1_Flexiband_realtime_III_1b.conf |  4 ++--
 ...r_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf |  4 ++--
 ...dr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf |  4 ++--
 ...ltichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |  4 ++--
 ...S_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf} |  6 +++---
 ...nss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |  6 +++---
 ...ultichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf |  6 +++---
 ...rt.conf => gnss-sdr_multisource_Hybrid_ishort.conf} | 18 ++----------------
 conf/gnss-sdr_multisource_Hybrid_nsr.conf              |  4 +---
 docs/manpage/gnss-sdr-manpage                          |  2 +-
 .../volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt    |  2 +-
 .../observables/adapters/hybrid_observables.h          |  4 ++--
 .../gnuradio_blocks/galileo_e1_observables_cc.h        |  2 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h         |  2 +-
 .../gnuradio_blocks/hybrid_observables_cc.h            |  2 +-
 src/main/main.cc                                       |  2 +-
 47 files changed, 86 insertions(+), 147 deletions(-)

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