[hamradio-commits] [gnss-sdr] 25/27: Merge branch 'anthony-arnold-osmoflags' 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 cec1aa2e7543c86f04026882e55fa04b0bb1595a
Merge: bf1c612 4fb3ec2
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Apr 30 20:18:05 2015 +0200

    Merge branch 'anthony-arnold-osmoflags' into next

 CMakeLists.txt                                     |   4 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         | 308 +++++++++++++++++++++
 src/algorithms/libs/CMakeLists.txt                 |  16 +-
 .../gnuradio_blocks/CMakeLists.txt                 |  10 +-
 .../adapters/nsr_file_signal_source.cc             |   2 +-
 .../adapters/osmosdr_signal_source.cc              |   8 +-
 .../signal_source/adapters/osmosdr_signal_source.h |   1 +
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   6 +-
 src/main/CMakeLists.txt                            |  24 +-
 src/utils/front-end-cal/CMakeLists.txt             |  49 ++--
 10 files changed, 371 insertions(+), 57 deletions(-)

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