[hamradio-commits] [gnss-sdr] 237/251: Merge branch 'next' of https://github.com/Arribas/gnss-sdr.git into next

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit af99f340a497765c390bb5e023961f8c3caf2c59
Merge: 1aa84cd fb2b124
Author: Javier Arribas <javiarribas at gmail.com>
Date:   Thu Aug 6 17:13:03 2015 +0200

    Merge branch 'next' of https://github.com/Arribas/gnss-sdr.git into next
    
    Conflicts:
    	src/algorithms/tracking/libs/cuda_multicorrelator.cu

 src/algorithms/tracking/libs/cuda_multicorrelator.h | 2 ++
 1 file changed, 2 insertions(+)


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