[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.5.2.1-242-gff30305

[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  ff30305872ee1a0c72db871260fb700c300fd349 (commit)
       via  c662d1c1625b1dbd0aa5d6345da60b985879460e (commit)
       via  8f84dfdd2104ec70057c31b70494bfac95b47424 (commit)
       via  a66a650a1f39118500434bc9c91b2ade24887149 (commit)
       via  fd52df0f706195d937e287189024f8aa6fbeaf60 (commit)
       via  5d3d5cf4315e14be805d8b87c00d0110c4a79797 (commit)
      from  2f73fe22c5e1591242a9556221ec8487170a7b00 (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 ff30305872ee1a0c72db871260fb700c300fd349
Merge: 8f84dfd c662d1c
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 5 12:14:57 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/grc/Makefile.am

commit 8f84dfdd2104ec70057c31b70494bfac95b47424
Merge: 2f73fe2 a66a650
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 5 10:39:55 2012 -0400

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

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

Summary of changes:
 CMakeLists.txt                                     |    4 ++
 gnuradio-core/src/lib/general/gr_char_to_float.h   |   10 ++++
 gnuradio-core/src/lib/general/gr_char_to_short.h   |    2 +
 gnuradio-core/src/lib/general/gr_float_to_char.h   |   10 ++++
 gnuradio-core/src/lib/general/gr_float_to_int.h    |   10 ++++
 gnuradio-core/src/lib/general/gr_float_to_short.h  |   10 ++++
 gnuradio-core/src/lib/general/gr_int_to_float.h    |   10 ++++
 gnuradio-core/src/lib/general/gr_short_to_char.h   |    2 +
 gnuradio-core/src/lib/general/gr_short_to_float.h  |   10 ++++
 gr-digital/grc/CMakeLists.txt                      |   35 +------------
 gr-digital/grc/digital_block_tree.xml              |    2 +
 gr-digital/grc/digital_mpsk_snr_est_cc.xml         |   56 ++++++++++++++++++++
 gr-digital/grc/digital_probe_mpsk_snr_est_c.xml    |   52 ++++++++++++++++++
 grc/blocks/block_tree.xml                          |    3 +
 grc/blocks/gr_char_to_float.xml                    |   17 ++++++-
 ...{gr_complex_to_arg.xml => gr_char_to_short.xml} |   13 ++---
 grc/blocks/gr_float_to_char.xml                    |   17 ++++++-
 .../{gr_nlog10_ff.xml => gr_float_to_int.xml}      |   31 ++++-------
 grc/blocks/gr_float_to_short.xml                   |   17 ++++++-
 grc/blocks/gr_int_to_float.xml                     |   17 ++++++-
 ...{gr_complex_to_arg.xml => gr_short_to_char.xml} |   13 ++---
 grc/blocks/gr_short_to_float.xml                   |   17 ++++++-
 22 files changed, 287 insertions(+), 71 deletions(-)
 create mode 100644 gr-digital/grc/digital_mpsk_snr_est_cc.xml
 create mode 100644 gr-digital/grc/digital_probe_mpsk_snr_est_c.xml
 copy grc/blocks/{gr_complex_to_arg.xml => gr_char_to_short.xml} (68%)
 copy grc/blocks/{gr_nlog10_ff.xml => gr_float_to_int.xml} (62%)
 copy grc/blocks/{gr_complex_to_arg.xml => gr_short_to_char.xml} (68%)


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