[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 7e3f4b841a5b154107ce93e942d6ee8b5001e42d

[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/jblum".

The branch, next has been updated
       via  7e3f4b841a5b154107ce93e942d6ee8b5001e42d (commit)
       via  5db486f0b081eee23f4a826cfe62091917cea96d (commit)
       via  c774e6efb5f715c5f8b5f20bd8dea0051da667fd (commit)
       via  170c4ba4b39889073b2a3f129e77ca9b2f91bbf2 (commit)
       via  d346cb287299a04a71ea21007025edb694409043 (commit)
      from  b999e708fee1d657fa6c34bee93a63559a495205 (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 7e3f4b841a5b154107ce93e942d6ee8b5001e42d
Merge: 5db486f c774e6e
Author: Josh Blum <address@hidden>
Date:   Wed Mar 28 17:55:48 2012 -0700

    Merge branch 'maint' into next
    
    Conflicts:
        gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc

commit 5db486f0b081eee23f4a826cfe62091917cea96d
Author: Josh Blum <address@hidden>
Date:   Wed Mar 28 17:54:09 2012 -0700

    extras: updated subproject

commit c774e6efb5f715c5f8b5f20bd8dea0051da667fd
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 22:04:44 2012 -0400

    doc: fix documentation for wavsink (thanks to John Coppens for point it 
out).

commit 170c4ba4b39889073b2a3f129e77ca9b2f91bbf2
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 27 14:14:03 2012 -0400

    core: when reseting buffers, make sure that the read/write pointers are 
always algined.
    
    This fixes problems when disconnecting and reconnecting blocks to a 
flowgraph.

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

Summary of changes:
 gnuradio-core/src/lib/io/gr_wavfile_sink.h         |    6 ++--
 gnuradio-core/src/lib/runtime/gr_buffer.h          |    3 ++
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc |   23 ++++++++++++++++++++
 gr-uhd/include/gr_uhd_usrp_source.h                |    4 +-
 gr-uhd/lib/gr_uhd_usrp_source.cc                   |    4 +-
 grextras                                           |    2 +-
 6 files changed, 34 insertions(+), 8 deletions(-)


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