[hamradio-commits] [gnss-sdr] 03/06: Merge branch 'next' of https://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 6f5589840b3332f7b769682f5b39eda3ea69cacb
Merge: fd7512e 05e7ca7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri May 13 20:03:08 2016 +0200

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

 CMakeLists.txt                                     |   26 +-
 README.md                                          |    6 +-
 conf/gnss-sdr.conf                                 |    2 +-
 conf/gnss-sdr_GPS_L1_ishort.conf                   |   13 +-
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        |   12 +-
 ..._short.conf => gnss-sdr_Galileo_E1_ishort.conf} |    6 +-
 ...brid_short.conf => gnss-sdr_Hybrid_ishort.conf} |   33 +-
 conf/old/gnss-sdr_SBAS_short.conf                  |  338 ----
 conf/old/gnss-sdr_acq_CCCWSR.conf                  |  391 -----
 conf/old/gnss-sdr_acq_Tong.conf                    |  393 -----
 conf/old/gnss-sdr_acq_assistance_test.conf         |  467 ------
 conf/old/gnss-sdr_array.conf                       |  395 -----
 ...gnss-sdr_galileo_e1_tcp_connector_tracking.conf |  273 ----
 conf/old/gnss-sdr_ishort_file_read.conf            |  445 ------
 conf/old/gnss-sdr_nmea_tty_output.conf             |  458 ------
 conf/old/gnss-sdr_tcp_connector_tracking.conf      |  416 -----
 conf/old/master.conf                               |  408 -----
 docs/doxygen/Doxyfile.generic                      | 1680 --------------------
 docs/doxygen/Doxyfile.in                           |  208 ++-
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |  176 +-
 .../galileo_e1_pcps_ambiguous_acquisition.h        |    7 +
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |   11 +-
 .../adapters/gps_l1_ca_pcps_acquisition.h          |    2 -
 .../adapters/gps_l2_m_pcps_acquisition.cc          |  189 ++-
 .../adapters/gps_l2_m_pcps_acquisition.h           |    5 +-
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   12 +-
 .../cmake/Packaging/volk_gnsssdr_profile-manpage   |   14 +-
 27 files changed, 520 insertions(+), 5866 deletions(-)

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