[hamradio-commits] [gnss-sdr] 23/149: Merge branch 'next' of git://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 6c5981480ae3ba67a52fcde7443ccf31946069e2
Merge: 9d3f51c c5407a5
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Jan 1 18:49:42 2016 +0100

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

 CMakeLists.txt                                     |  4 +-
 README.md                                          |  6 +-
 drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake  |  8 ++-
 drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake     |  6 +-
 src/algorithms/channel/adapters/CMakeLists.txt     |  4 --
 src/algorithms/channel/adapters/channel.cc         | 11 +---
 src/core/receiver/control_thread.cc                | 76 ++++++++++++----------
 .../control_thread/control_message_factory_test.cc |  9 +--
 8 files changed, 64 insertions(+), 60 deletions(-)

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