[hamradio-commits] [gnss-sdr] 03/06: Merge branch 'next' of git://github.com/carlesfernandez/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 9ab60917b137695c36bd501bb0ca8a0cc28525c0
Merge: e1c5fc6 237f9c0
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Dec 24 12:06:05 2014 +0100

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

 CMakeLists.txt                                     | 19 ++++++---
 .../tracking/gnuradio_blocks/CMakeLists.txt        |  1 +
 src/core/receiver/gnss_flowgraph.cc                |  4 --
 src/tests/CMakeLists.txt                           | 47 ++++++++++++++++++----
 src/tests/control_thread/control_thread_test.cc    | 20 ++++-----
 src/tests/single_test_main.cc                      |  2 +-
 6 files changed, 66 insertions(+), 27 deletions(-)

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