[Commit-gnuradio] [gnuradio] 23/28: Merge branch 'inplace_blocks' of gnuradio.org:jblum into gr_basic

[git]

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

nwest pushed a commit to annotated tag gr_basic_work
in repository gnuradio.

commit 4c0299d0e12fa5550c92f50e5752b2708833d8b0
Merge: 5f01af5 138d39f
Author: Josh Blum <address@hidden>
Date:   Tue Nov 15 09:40:34 2011 -0800

    Merge branch 'inplace_blocks' of gnuradio.org:jblum into gr_basic

 gnuradio-core/src/lib/general/gr_throttle.cc       |  5 +-
 gnuradio-core/src/lib/gengen/gr_add_XX.cc.t        |  2 +
 gnuradio-core/src/lib/gengen/gr_add_const_XX.cc.t  |  1 +
 gnuradio-core/src/lib/gengen/gr_add_const_vXX.cc.t |  1 +
 gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t     |  2 +
 gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t   |  2 +
 .../src/lib/gengen/gr_multiply_const_XX.cc.t       |  1 +
 .../src/lib/gengen/gr_multiply_const_vXX.cc.t      |  1 +
 gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t       |  1 +
 gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t        |  2 +
 gnuradio-core/src/lib/runtime/gr_block.cc          | 10 ++++
 gnuradio-core/src/lib/runtime/gr_block.h           | 18 +++++++
 gnuradio-core/src/lib/runtime/gr_buffer.cc         | 16 ++++++
 gnuradio-core/src/lib/runtime/gr_buffer.h          | 18 +++++++
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc | 63 ++++++++++++++++++++++
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h  |  2 +
 gnuradio-core/src/lib/runtime/gr_tpb_detail.cc     |  5 +-
 17 files changed, 147 insertions(+), 3 deletions(-)