[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.4.1-429-g52b42b9

[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  52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (commit)
       via  3b08bd8312f7499a3ffcaba147f5fe7a66f91ba4 (commit)
       via  6474548641d8b611adf6c5a08aa3da06508d77bf (commit)
       via  f76eab20ff3811690f5dcbaa04d2c4e41f4b298b (commit)
      from  f664585ddddeb040d1cd285d0b9dfb41c4979b91 (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 52b42b9e958be6908ab5279bbe4ecea8b2464ee8
Merge: 3b08bd8 6474548
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 18 20:46:04 2011 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/general.i

commit 3b08bd8312f7499a3ffcaba147f5fe7a66f91ba4
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 18 20:41:09 2011 -0700

    digital: xml is so picky. This fixes the problems with the new GRC blocks 
in issue #449.

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

Summary of changes:
 gnuradio-core/src/lib/general/Makefile.am          |    3 +
 gnuradio-core/src/lib/general/general.i            |    2 +
 gnuradio-core/src/lib/general/gr_transcendental.cc |  153 ++++++++++++++++++++
 .../src/lib/general/gr_transcendental.h            |   34 +++--
 .../src/lib/general/gr_transcendental.i            |   18 +--
 gr-digital/grc/digital_ofdm_sampler.xml            |    2 +-
 gr-digital/grc/digital_ofdm_sync_pn.xml            |    2 +-
 gr-wxgui/grc/wxgui_fftsink2.xml                    |    4 +-
 gr-wxgui/grc/wxgui_waterfallsink2.xml              |    2 +-
 grc/blocks/Makefile.am                             |    1 +
 grc/blocks/block_tree.xml                          |    2 +-
 .../{gr_rms_xx.xml => gr_transcendental.xml}       |   28 ++--
 12 files changed, 201 insertions(+), 50 deletions(-)
 create mode 100644 gnuradio-core/src/lib/general/gr_transcendental.cc
 copy gr-vocoder/include/vocoder_g721_encode_sb.h => 
gnuradio-core/src/lib/general/gr_transcendental.h (55%)
 copy gr-audio/swig/audio_swig.i => 
gnuradio-core/src/lib/general/gr_transcendental.i (74%)
 copy grc/blocks/{gr_rms_xx.xml => gr_transcendental.xml} (54%)


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