[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4.1-991-g73367de

[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, next has been updated
       via  73367de69a1384295937945549d210d51a0a19ef (commit)
       via  8088f125a9a432de321c62b82755a895d5184080 (commit)
      from  2caaabf8e1dd771174fd42e51c8c8090864638e6 (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 73367de69a1384295937945549d210d51a0a19ef
Merge: 2caaabf 8088f12
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 29 13:26:22 2013 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-runtime/include/gr_block.h

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

Summary of changes:
 .../src/python/gnuradio/gr/qa_affinity.py          |   23 +++++++----
 gnuradio-runtime/include/gr_block.h                |    8 ++--
 gnuradio-runtime/include/gr_block_detail.h         |    4 +-
 gnuradio-runtime/lib/gr_block.cc                   |    2 +-
 gnuradio-runtime/lib/gr_block_detail.cc            |    2 +-
 gnuradio-runtime/swig/gr_block.i                   |    4 +-
 gr-blocks/lib/qa_gr_top_block.cc                   |    2 +-
 gruel/src/include/gruel/thread.h                   |    6 +-
 gruel/src/lib/thread.cc                            |   40 ++++++++++----------
 9 files changed, 48 insertions(+), 43 deletions(-)
 copy gr-blocks/python/qa_tag_debug.py => 
gnuradio-core/src/python/gnuradio/gr/qa_affinity.py (72%)
 mode change 100755 => 100644


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