[Commit-gnuradio] [gnuradio] branch master updated (ad799cf -> 34ee3b7)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  ad799cf   zeromq: Add qa code for zeromq_pubsub
       new  a8d28ad   trellis: fix typos in examples
       new  34ee3b7   Merge branch 'maint'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gr-trellis/examples/python/test_cpm.py          | 2 +-
 gr-trellis/examples/python/test_tcm_parallel.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)