[hamradio-commits] [gnss-sdr] 95/236: 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 05076187364f9e9189800856deb39881a3fa137f
Merge: fcae1e0 2cf1ea8
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Mar 15 09:35:59 2016 +0100

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

 conf/gnss-sdr_Hybrid_nsr.conf                      |  19 +-
 docs/doxygen/Doxyfile.in                           |   1 +
 src/algorithms/channel/adapters/channel.cc         |   4 +
 .../volk_gnsssdr_module/volk_gnsssdr/README.md     |   2 +-
 .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc      |   2 +-
 .../volk_gnsssdr/cmake/Modules/VolkAddTest.cmake   |   2 +-
 .../volk_gnsssdr/docs/extending_volk.dox           |  92 ++++++
 .../volk_gnsssdr/docs/kernels.dox                  |  24 ++
 .../volk_gnsssdr/docs/main_page.dox                |  19 ++
 .../volk_gnsssdr/docs/terms_and_techniques.dox     | 121 ++++++++
 .../volk_gnsssdr/docs/using_volk_gnsssdr.dox       |  19 ++
 .../include/volk_gnsssdr/volk_gnsssdr_common.h     |   4 +
 .../volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h  |  52 ++--
 .../volk_gnsssdr_16ic_resampler_16ic.h             |  67 ++--
 .../volk_gnsssdr_16ic_resamplerpuppet_16ic.h       |   4 +-
 .../volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h     |   9 +-
 .../volk_gnsssdr_16ic_rotatorpuppet_16ic.h         |  10 +-
 .../volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h      |  68 ++--
 .../volk_gnsssdr_16ic_x2_dot_prod_16ic.h           | 117 +++++--
 .../volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h        | 145 ++++++---
 .../volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h    |  40 ++-
 .../volk_gnsssdr_16ic_x2_multiply_16ic.h           |  59 ++--
 ...volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h | 245 ++++++++++++---
 ..._gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h |  40 ++-
 .../volk_gnsssdr_16ic_xn_resampler_16ic_xn.h       |  88 +++---
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h  |  67 ++--
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h   |  50 +--
 .../volk_gnsssdr_64f_accumulator_64f.h             | 247 ++++++++-------
 .../volk_gnsssdr/volk_gnsssdr_8i_accumulator_s8i.h |  69 +++--
 .../volk_gnsssdr/volk_gnsssdr_8i_index_max_16u.h   |  80 +++--
 .../kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h |  65 ++--
 .../volk_gnsssdr/volk_gnsssdr_8i_x2_add_8i.h       |  67 ++--
 .../volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h  |  94 +++---
 .../volk_gnsssdr_8ic_magnitude_squared_8i.h        |  67 ++--
 .../volk_gnsssdr_8ic_s8ic_multiply_8ic.h           | 127 ++++----
 .../volk_gnsssdr_8ic_x2_dot_prod_8ic.h             | 277 ++++++++---------
 .../volk_gnsssdr_8ic_x2_multiply_8ic.h             |  71 ++---
 .../volk_gnsssdr/volk_gnsssdr_8u_x2_multiply_8u.h  | 106 ++++---
 .../volk_gnsssdr/lib/CMakeLists.txt                |   2 +-
 .../volk_gnsssdr/lib/gcc_x86_cpuid.h               | 183 -----------
 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c      |   5 +-
 .../volk_gnsssdr/volk_gnsssdr.pc.in                |   2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |  74 ++++-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         | 341 ++++++++++++++-------
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |  16 +
 src/core/receiver/gnss_flowgraph.cc                |  12 +-
 src/core/system_parameters/GPS_L1_CA.h             |   1 +
 src/core/system_parameters/gnss_synchro.h          |   2 +
 48 files changed, 1886 insertions(+), 1392 deletions(-)


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