[hamradio-commits] [gnss-sdr] 241/251: Merge branch 'next-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 7b57bd28f8548039d3247b0a80df6c1039e8e640
Merge: af99f34 43c3aa7
Author: Javier Arribas <javiarribas at gmail.com>
Date:   Tue Aug 25 12:40:31 2015 +0200

    Merge branch 'next-gnss-sdr' into next

 CMakeLists.txt                                     |  12 +-
 README.md                                          | 173 ++++++----
 cmake/Modules/FindGnuradio.cmake                   |  17 +-
 conf/gnss-sdr.conf                                 |  77 ++---
 conf/gnss-sdr_GPS_L1_GN3S_realtime.conf            | 348 +++------------------
 conf/gnss-sdr_GPS_L1_SPIR.conf                     |  76 ++---
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |   6 +-
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf            | 133 ++------
 conf/gnss-sdr_GPS_L1_gr_complex.conf               | 265 ++--------------
 conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf     | 105 ++-----
 conf/gnss-sdr_GPS_L1_nsr.conf                      | 216 ++-----------
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |  72 ++---
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          | 219 ++-----------
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             | 226 ++-----------
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf   |  82 +++++
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        | 131 ++------
 conf/gnss-sdr_Galileo_E1_nsr.conf                  | 299 ++----------------
 conf/gnss-sdr_Galileo_E1_short.conf                |  76 ++---
 conf/gnss-sdr_Galileo_E5a.conf                     |  66 ----
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           | 272 +---------------
 conf/gnss-sdr_Hybrid_byte.conf                     |   6 -
 conf/gnss-sdr_Hybrid_nsr.conf                      |   3 -
 conf/gnss-sdr_Hybrid_short.conf                    |   8 +-
 conf/{ => old}/gnss-sdr_SBAS_short.conf            |   0
 drivers/gr-gn3s/CMakeLists.txt                     |   9 +-
 drivers/gr-gn3s/README                             |  69 ----
 drivers/gr-gn3s/README.md                          | 225 +++++++++++++
 .../cmake/Modules/FindGnuradioRuntime.cmake        | 131 +++++++-
 drivers/gr-gn3s/cmake/Modules/FindUSB.cmake        |  66 ++--
 drivers/gr-gn3s/cmake/Modules/GrSwig.cmake         |  55 ++--
 drivers/gr-gn3s/cmake/Modules/GrTest.cmake         |   9 +-
 drivers/gr-gn3s/grc/CMakeLists.txt                 |  17 +-
 drivers/gr-gn3s/include/CMakeLists.txt             |  17 +-
 drivers/gr-gn3s/lib/CMakeLists.txt                 |  22 +-
 drivers/gr-gn3s/python/CMakeLists.txt              |  17 +-
 drivers/gr-gn3s/swig/CMakeLists.txt                |  17 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |   6 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |   2 +-
 .../kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h |  24 +-
 .../signal_source/adapters/CMakeLists.txt          |   4 +-
 .../adapters/two_bit_cpx_file_signal_source.cc     |   9 +-
 .../adapters/two_bit_cpx_file_signal_source.h      |   9 +-
 .../unpack_byte_2bit_cpx_samples.cc                |  63 ++--
 src/algorithms/signal_source/libs/CMakeLists.txt   |   5 +
 .../telemetry_decoder/adapters/CMakeLists.txt      |  10 +-
 .../adapters/gps_l2_m_telemetry_decoder.cc         |   6 +-
 src/core/receiver/CMakeLists.txt                   |   6 +
 src/core/receiver/gnss_block_factory.cc            |   2 +
 src/main/main.cc                                   |   4 +-
 src/tests/CMakeLists.txt                           |  48 ++-
 src/tests/flowgraph/gnss_flowgraph_test.cc         | 224 ++++++++++++-
 .../gnss_block/gps_l2_m_pcps_acquisition_test.cc   |  10 +-
 src/tests/single_test_main.cc                      |   7 +
 src/tests/test_main.cc                             |   4 +-
 54 files changed, 1404 insertions(+), 2581 deletions(-)


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