[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 3685f358f99c4f5fc5b6d88971f3660d84be7fdc

[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  3685f358f99c4f5fc5b6d88971f3660d84be7fdc (commit)
       via  ec064ec02b3490369263a845ba617e6a8655cc49 (commit)
       via  545bbe39f8d51d6b2aa6f8a38ae603fcce654ebb (commit)
       via  61b4f5e1a1141cee6c5ccb16d648f1d195f73c77 (commit)
       via  4beff39af568adf54e30f434644f7b666db28a04 (commit)
       via  58aba98d66be4024f9da62944b1cd440bdeae35e (commit)
       via  e9ba60e518193ddcbfb069270bb674b4e7964f25 (commit)
       via  bd56b0d7d5ab684f2a22279164832756ec8e459e (commit)
       via  5c4da9040913bc999cb9e698851c9f38abc70038 (commit)
       via  2a2411a598c222e2ef82b857c0b53e0a9d1daf3f (commit)
       via  564b266eb1014b09f0e658686ca3dc7b8c5dae0d (commit)
       via  53407a4e5bea98ce4f2566968acb577ac0700dfc (commit)
      from  60be272e2e2f086ee4c9a12f9ca42d774e917141 (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 3685f358f99c4f5fc5b6d88971f3660d84be7fdc
Merge: ec064ec 61b4f5e
Author: Josh Blum <address@hidden>
Date:   Mon Jan 16 22:12:34 2012 -0800

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
    
    Conflicts:
        grc/blocks/block_tree.xml

commit ec064ec02b3490369263a845ba617e6a8655cc49
Merge: 60be272 545bbe3
Author: Josh Blum <address@hidden>
Date:   Mon Jan 16 22:11:30 2012 -0800

    Merge branch 'new_blocks' into next

commit 61b4f5e1a1141cee6c5ccb16d648f1d195f73c77
Merge: bd56b0d 4beff39
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 10:11:51 2012 -0500

    Merge branch 'master' into next

commit 4beff39af568adf54e30f434644f7b666db28a04
Merge: 5c4da90 58aba98
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 10:11:25 2012 -0500

    Merge branch 'maint'

commit 58aba98d66be4024f9da62944b1cd440bdeae35e
Author: Tom Rondeau <address@hidden>
Date:   Mon Jan 16 10:09:01 2012 -0500

    digital: fixing up BERT interfaces. Also added a gain control to the tx 
side (so options.amplitude is actually used).

commit e9ba60e518193ddcbfb069270bb674b4e7964f25
Author: Marcus Leech <address@hidden>
Date:   Sun Jan 15 23:49:52 2012 -0500

    core: fix for off-by-one issue in strip chart. Increases buffer size for 
longer displays.

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

commit 5c4da9040913bc999cb9e698851c9f38abc70038
Author: Marcus Leech <address@hidden>
Date:   Mon Jan 16 00:15:05 2012 -0500

    core: the burst_tag block can have user-defined keys and values for the 
tags when a burst is on or off instead of static values. Defaults are the same. 
Use set_true_tag and set_false_tag to override these.

commit 2a2411a598c222e2ef82b857c0b53e0a9d1daf3f
Author: Marcus Leech <address@hidden>
Date:   Sun Jan 15 23:49:52 2012 -0500

    core: fix for off-by-one issue in strip chart. Increases buffer size for 
longer displays.

commit 564b266eb1014b09f0e658686ca3dc7b8c5dae0d
Merge: 72d1ff0 53407a4
Author: Tom Rondeau <address@hidden>
Date:   Sun Jan 15 18:37:32 2012 -0500

    Merge branch 'master' into next

commit 53407a4e5bea98ce4f2566968acb577ac0700dfc
Author: Tom Rondeau <address@hidden>
Date:   Sun Jan 15 18:36:17 2012 -0500

    digital: added get/set functions to mpsk_receiver_cc for theta (phase 
offset), omega relative limit, and modulation order.

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

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 +-
 gr-blocks/python/__init__.py                      |    2 +-
 gr-digital/examples/narrowband/digital_bert_rx.py |    2 +
 gr-digital/examples/narrowband/digital_bert_tx.py |    7 +-
 gr-digital/include/digital_mpsk_receiver_cc.h     |   43 +++++++---
 gr-digital/lib/digital_mpsk_receiver_cc.cc        |   17 ++++-
 gr-digital/swig/digital_mpsk_receiver_cc.i        |    5 +
 grc/blocks/block_tree.xml                         |    1 +
 grc/blocks/gr_burst_tagger.xml                    |   87 +++++++++++++++++++++
 12 files changed, 193 insertions(+), 29 deletions(-)
 create mode 100644 grc/blocks/gr_burst_tagger.xml


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