[hamradio-commits] [gnss-sdr] 06/06: 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 c04fcb13ece41b9a4c1dc27c0f191c8689292c92
Merge: 931d410 dcb6ed7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Jan 14 09:57:56 2015 +0100

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

 CMakeLists.txt                                     | 41 +++++++++++++---------
 cmake/Modules/GnssSdrPackaging.cmake               |  2 +-
 docs/doxygen/other/reference_docs.dox              |  6 ++--
 drivers/gr-dbfcttc/include/dbfcttc/api.h           | 30 ++++++++++------
 drivers/gr-dbfcttc/include/dbfcttc/raw_array.h     |  4 +--
 drivers/gr-dbfcttc/lib/qa_dbfcttc.cc               | 23 +++++++-----
 drivers/gr-dbfcttc/lib/qa_dbfcttc.h                | 24 +++++++------
 drivers/gr-dbfcttc/lib/qa_raw_array.cc             |  4 +--
 drivers/gr-dbfcttc/lib/qa_raw_array.h              |  4 +--
 drivers/gr-dbfcttc/lib/raw_array_impl.cc           |  4 +--
 drivers/gr-dbfcttc/lib/raw_array_impl.h            |  4 +--
 drivers/gr-dbfcttc/lib/test_dbfcttc.cc             | 30 ++++++++++------
 .../tracking/libs/tracking_2nd_DLL_filter.cc       |  2 +-
 .../tracking/libs/tracking_2nd_PLL_filter.cc       |  2 +-
 .../tracking/libs/tracking_2nd_PLL_filter.h        |  2 +-
 .../tracking/libs/tracking_FLL_PLL_filter.cc       |  2 +-
 .../tracking/libs/tracking_FLL_PLL_filter.h        |  2 +-
 src/core/receiver/concurrent_queue.h               |  2 +-
 src/core/receiver/control_message.h                |  2 +-
 src/core/receiver/control_thread.cc                |  2 +-
 src/core/receiver/control_thread.h                 |  4 +--
 src/main/main.cc                                   |  2 +-
 22 files changed, 116 insertions(+), 82 deletions(-)

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