[Commit-gnuradio] [gnuradio] branch master updated (33e5aeb -> 73f138e)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  33e5aeb   Merge branch 'merge-codec2-update'
       new  a9ea688   Corrected codec2 encoder documentation.
       new  7b3f997   documentation - fix example in case anyone gets confused
       new  73f138e   Merge branch 'maint'

The 3 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:
 docs/doxygen/other/main_page.dox                       | 4 ++--
 gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)