[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.5.1-31-gbd56b0d

[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  bd56b0d7d5ab684f2a22279164832756ec8e459e (commit)
       via  5c4da9040913bc999cb9e698851c9f38abc70038 (commit)
       via  2a2411a598c222e2ef82b857c0b53e0a9d1daf3f (commit)
      from  564b266eb1014b09f0e658686ca3dc7b8c5dae0d (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 bd56b0d7d5ab684f2a22279164832756ec8e459e
Merge: 564b266 5c4da90
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 00:17:08 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        grc/blocks/Makefile.am

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

Summary of changes:
 gnuradio-core/src/lib/general/gr_burst_tagger.cc |   38 ++++++++--
 gnuradio-core/src/lib/general/gr_burst_tagger.h  |   11 ++-
 gnuradio-core/src/lib/general/gr_burst_tagger.i  |    4 +
 gnuradio-core/src/lib/io/gr_oscope_guts.cc       |    5 +-
 grc/blocks/block_tree.xml                        |    1 +
 grc/blocks/gr_burst_tagger.xml                   |   87 ++++++++++++++++++++++
 6 files changed, 135 insertions(+), 11 deletions(-)
 create mode 100644 grc/blocks/gr_burst_tagger.xml


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