[hamradio-commits] [gnss-sdr] 18/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 9d3f51ce7df7bdf139a01b31b7796ea9673faa1f
Merge: f9f0f72 217ed14
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Dec 26 19:22:13 2015 +0100

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

 conf/gnss-sdr.conf                          | 41 +++++++++++++----------------
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf     |  4 +--
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf |  4 +--
 conf/gnss-sdr_Galileo_E1_short.conf         | 18 ++++++-------
 conf/gnss-sdr_Hybrid_short.conf             |  6 ++---
 conf/gnss-sdr_multisource_Hybrid_short.conf | 26 +++++++++---------
 src/core/system_parameters/rtcm.h           | 17 ++++++++++++
 7 files changed, 65 insertions(+), 51 deletions(-)

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