[hamradio-commits] [gnss-sdr] 133/149: Merge 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 b00b7e29864c0b7da2b96bcc788d1eff1e2c4e48
Merge: 469cd2b 3d44e09
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Jan 29 19:26:43 2016 +0100

    Merge git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Conflicts:
    #	CMakeLists.txt


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