[Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'mfischer/micro_cleanup'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a3080e66f4e1e1bc9be7ca74d8cae48f40bf85ac
Merge: 4149239 4db9371
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 4 09:48:27 2015 -0700

    Merge remote-tracking branch 'mfischer/micro_cleanup'
    
    Conflicts:
        volk

 gnuradio-runtime/include/gnuradio/basic_block.h | 1 -
 1 file changed, 1 deletion(-)