[hamradio-commits] [gnss-sdr] 127/149: Merge branch 'next' of git+ssh://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 2014149e17cbfacedcb90a1badabc41a997fa467
Merge: b270d1c d2898c4
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Jan 28 18:10:21 2016 +0100

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 .../volk_gnsssdr_module/volk_gnsssdr/README.md     |   6 +
 .../volk_gnsssdr_16ic_rotatorpuppet_16ic.h         |  56 ++++-
 .../volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h      | 234 +++++++++++++++++++--
 3 files changed, 273 insertions(+), 23 deletions(-)

diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
index c788018,c788018..b7c595c
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
@@@ -14,6 -14,6 +14,12 @@@ This library is automatically built an
  
  However, you can install and use VOLK_GNSSSDR kernels as you use VOLK's, independently from GNSS-SDR.
  
++First, make sure that the required dependencies are installed in you machine:
++
++~~~~~~ 
++$ sudo apt-get install git subversion cmake python-cheetah libboost-dev libbbost-filesystem
++~~~~~~ 
++
  In order to build and install the library, go to the base folder of the source code and do:
  
  ~~~~~~ 

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