[Commit-gnuradio] [gnuradio] 08/14: Merge remote-tracking branch 'osh/typo_fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 66c609e53eb659d377c3f31cb18010f88686a5a2
Merge: fd6feaf b94ce24
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 9 13:44:21 2014 -0700

    Merge remote-tracking branch 'osh/typo_fix'

 gnuradio-runtime/include/gnuradio/block.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)