[Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'tom/fec/dummy_enc_docs'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 43848e6ae0860f612311f019eea2715c9ff402b8
Merge: 71428c9 538fe75
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 5 13:31:51 2015 -0700

    Merge remote-tracking branch 'tom/fec/dummy_enc_docs'

 gr-fec/include/gnuradio/fec/dummy_encoder.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)