[hamradio-commits] [gnss-sdr] 06/06: 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 a95f33b3c497a38cc50cb930b7b34f478280f340
Merge: 815bc61 b665444
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Sep 18 23:34:13 2015 +0200

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

 drivers/gr-gn3s/python/Makefile                    | 190 ---------------------
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |   2 +-
 .../include/volk_gnsssdr/volk_gnsssdr_complex.h    |   5 +
 3 files changed, 6 insertions(+), 191 deletions(-)

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