[hamradio-commits] [gnss-sdr] 02/02: 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 120bf43dd6eaf05d2bd2774a47949af6a8f550dc
Merge: b6b3f1a f3df860
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Jul 4 19:35:47 2016 +0200

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

 CMakeLists.txt                                     |  6 ++-
 README.md                                          |  6 +--
 docs/manpage/gnss-sdr-manpage                      |  2 +-
 .../volk_gnsssdr/CMakeLists.txt                    | 46 +++++++++++++++++++---
 .../volk_gnsssdr_module/volk_gnsssdr/README.md     | 10 +++++
 .../volk_gnsssdr/apps/CMakeLists.txt               | 20 ++++++++--
 .../volk_gnsssdr/apps/volk_gnsssdr-config-info.cc  | 19 +++++++++
 .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc      | 30 +++++++++++++-
 .../volk_gnsssdr/apps/volk_gnsssdr_profile.h       |  2 +
 ...VolkConfig.cmake => VolkGnsssdrConfig.cmake.in} |  2 +
 ....cmake.in => VolkGnsssdrConfigVersion.cmake.in} |  0
 .../volk_gnsssdr/lib/CMakeLists.txt                |  6 +--
 .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c          | 10 +++++
 src/main/main.cc                                   |  2 +-
 14 files changed, 140 insertions(+), 21 deletions(-)

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