[hamradio-commits] [gnss-sdr] 214/303: Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into siggen

[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 750c4a62972414c45e3c4f6e6f40709161630885
Merge: f12e8b9 878d297
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Dec 27 21:06:13 2016 +0100

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

 CMakeLists.txt                                     |  83 ++++++++++-----
 README.md                                          | 111 +++++----------------
 cmake/Modules/SetupPython.cmake                    |  78 +++++++++++++++
 conf/gnss-sdr.conf                                 |   2 +-
 docs/doxygen/other/main_page.dox                   |  12 +--
 .../volk_gnsssdr/CMakeLists.txt                    |  19 ++--
 .../volk_gnsssdr_module/volk_gnsssdr/README.md     |   2 +-
 .../volk_gnsssdr/apps/CMakeLists.txt               |  15 ++-
 .../volk_gnsssdr/cmake/Modules/VolkPython.cmake    |   9 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py     |   8 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py |   8 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py   |  10 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py  |   7 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py    |  28 ++----
 .../volk_gnsssdr/lib/CMakeLists.txt                |   7 +-
 .../python/volk_gnsssdr_modtool/cfg.py             |  10 +-
 .../volk_gnsssdr_modtool_generate.py               |   9 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c          | 106 ++++++++++----------
 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h          |  14 +--
 .../tmpl/volk_gnsssdr_config_fixed.tmpl.h          |  10 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c      |  25 +++--
 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h      |   6 +-
 .../tmpl/volk_gnsssdr_machine_xxx.tmpl.c           |  76 ++++++--------
 .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c |   8 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h |  24 ++---
 .../volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h |   6 +-
 26 files changed, 365 insertions(+), 328 deletions(-)

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