[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.7.0git-96-gfed9214

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, master has been updated
       via  fed9214214380a1d8ce3aef8c3a953e0490adb1f (commit)
       via  cd5018f85a730ec697b34e7ff5ddfb20e8d97f33 (commit)
       via  382aeb95372de773506a5946e6a25b7a8eb79151 (commit)
       via  997051fc85e6530c63adc9b718343e0615148c43 (commit)
       via  fb4e968e1785e0b02b82254fddb19e07fda61723 (commit)
      from  5ca7c447f21967df18623937c0d3a4951b699ca1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fed9214214380a1d8ce3aef8c3a953e0490adb1f
Merge: 997051f cd5018f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 7 10:09:57 2013 -0400

    Merge remote-tracking branch 'reynwar/minorfixes'

commit cd5018f85a730ec697b34e7ff5ddfb20e8d97f33
Author: Ben Reynwar <address@hidden>
Date:   Fri Jun 7 09:29:52 2013 -0700

    docs: Removing gr-shd from sphinx docs.

commit 382aeb95372de773506a5946e6a25b7a8eb79151
Author: Ben Reynwar <address@hidden>
Date:   Fri Jun 7 09:24:22 2013 -0700

    runtime: Move logic from block.h to block.cc.

commit 997051fc85e6530c63adc9b718343e0615148c43
Merge: 5ca7c44 fb4e968
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 7 10:08:00 2013 -0400

    Merge branch 'maint'
    
    Conflicts:
        gr-blocks/python/blocks/qa_file_metadata.py

-----------------------------------------------------------------------

Summary of changes:
 docs/sphinx/source/index.rst                |    2 -
 docs/sphinx/source/shd.rst                  |    8 ----
 gnuradio-runtime/include/gnuradio/block.h   |   52 +++--------------------
 gnuradio-runtime/lib/block.cc               |   60 +++++++++++++++++++++++++++
 gr-blocks/python/blocks/qa_file_metadata.py |    8 ++-
 5 files changed, 72 insertions(+), 58 deletions(-)
 delete mode 100644 docs/sphinx/source/shd.rst


hooks/post-receive
-- 
git://gnuradio.org/gnuradio