[hamradio-commits] [gnss-sdr] 201/236: Merge branch 'next' of https://git.code.sf.net/p/gnss-sdr/cttc 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 c5051225e4dbada6e9f268ab462a6c7fa470f6c0
Merge: 5cdd6b2 1f8f63a
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Apr 21 15:19:41 2016 +0200

    Merge branch 'next' of https://git.code.sf.net/p/gnss-sdr/cttc into next

 README.md                       |  2 +-
 conf/gnss-sdr_Hybrid_short.conf | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

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