[hamradio-commits] [gnss-sdr] 67/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 32a36c3a438b3315b054581e0fa30a838a960664
Merge: 7b562e8 833ca8a
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Mar 4 14:13:05 2016 +0100

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

 src/algorithms/tracking/adapters/CMakeLists.txt    |   1 -
 .../galileo_volk_e1_dll_pll_veml_tracking.cc       | 163 -----
 .../galileo_volk_e1_dll_pll_veml_tracking.h        | 114 ----
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   1 -
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.cc    | 686 ---------------------
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.h     | 211 -------
 src/core/receiver/gnss_block_factory.cc            |  19 -
 src/core/receiver/gnss_flowgraph.cc                |   6 +-
 8 files changed, 5 insertions(+), 1196 deletions(-)

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