[hamradio-commits] [gnss-sdr] 27/27: Merge remote-tracking branch 'origin/next' 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 f4aaa0ff2dd720074eea4e3eae4422b3e952a884
Merge: 099dd5f 7cbc0a6
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri May 1 09:59:17 2015 +0200

    Merge remote-tracking branch 'origin/next' into next

 CMakeLists.txt                                     |    4 +-
 cmake/Modules/FindVolk.cmake                       |    4 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |  308 ++++++
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 1022 ++++++++++----------
 .../pcps_acquisition_fine_doppler_cc.cc            |    4 +-
 src/algorithms/libs/CMakeLists.txt                 |   16 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c         |   35 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c          |    8 +-
 .../gnuradio_blocks/CMakeLists.txt                 |   10 +-
 .../adapters/nsr_file_signal_source.cc             |    2 +-
 .../adapters/osmosdr_signal_source.cc              |    8 +-
 .../signal_source/adapters/osmosdr_signal_source.h |    1 +
 .../galileo_e1b_telemetry_decoder_cc.cc            |    2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |    2 +-
 .../tracking/gnuradio_blocks/CMakeLists.txt        |    6 +-
 src/core/receiver/gnss_flowgraph.cc                |    2 +-
 .../galileo_navigation_message.cc                  |    4 +-
 src/core/system_parameters/galileo_utc_model.cc    |    3 +-
 .../system_parameters/gps_navigation_message.cc    |    3 +-
 src/core/system_parameters/gps_utc_model.cc        |    3 +-
 src/core/system_parameters/sbas_telemetry_data.cc  |    7 +-
 src/main/CMakeLists.txt                            |   24 +-
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |    4 +-
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |    4 +-
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |   16 +-
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |    4 +-
 ...a_pcps_multithread_acquisition_gsoc2013_test.cc |    4 +-
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |    4 +-
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |    4 +-
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |    4 +-
 src/tests/single_test_main.cc                      |    1 +
 src/tests/test_main.cc                             |    4 +-
 src/utils/front-end-cal/CMakeLists.txt             |   49 +-
 37 files changed, 942 insertions(+), 650 deletions(-)

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