[hamradio-commits] [gnss-sdr] 11/27: 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 099dd5f4d4380c3dd48809697268a51b3bab2a14
Merge: ab06617 f250e08
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Apr 25 13:03:50 2015 +0200

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

 CMakeLists.txt                                     | 109 ++----
 README.md                                          |  41 +-
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           | 415 +++++++++++++++++++++
 ...ichannel_GPS_L1_Flexiband_bin_file_III_1a.conf} |  28 +-
 ...ichannel_GPS_L1_Flexiband_realtime_III_1a.conf} |  25 +-
 ...ichannel_GPS_L1_Flexiband_realtime_III_1b.conf} |  25 +-
 ...tichannel_GPS_L1_Flexiband_realtime_II_3b.conf} |  23 +-
 ...ltichannel_GPS_L1_Flexiband_realtime_I_1b.conf} |  19 +-
 .../adapters/flexiband_signal_source.cc            |   5 +-
 .../adapters/flexiband_signal_source.h             |   2 +
 10 files changed, 545 insertions(+), 147 deletions(-)

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