[hamradio-commits] [gnss-sdr] 109/126: Merge branch 'next' of git+ssh://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 24982b1213b9dd35037406d4c3585a9e6b571a5b
Merge: 5bc26b3 9acc7e7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Dec 23 01:36:05 2015 +0100

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf           |  24 +-
 conf/gnss-sdr_Hybrid_byte_sim.conf                 |   4 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           | 306 +++++++++++----------
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |  34 ++-
 .../tracking/libs/cpu_multicorrelator.cc           |   7 +-
 .../tracking/libs/cuda_multicorrelator.cu          | 253 +++++------------
 .../tracking/libs/cuda_multicorrelator.h           |   2 +-
 7 files changed, 264 insertions(+), 366 deletions(-)

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