[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-407-g87e2bd3

[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  87e2bd3dddd172eb8264ab12202659c18ba09880 (commit)
       via  bcb5c077d3cd0cac072670667fe6cf18244b9efe (commit)
       via  0b62e85e4c57796098c4ecf367c8aa16a120e791 (commit)
       via  d4cec71c426653edbe1d2c552388f20939f09a8e (commit)
       via  a5f794128d8386ff0067cbe2928af4ded728d3b2 (commit)
       via  28c0786bccd2069c9b34dad6968544875af47567 (commit)
       via  d4c91c146f50059eca1ccab9bb5a9f96fbe31c42 (commit)
       via  33d9cf8800d3b4c0bbbff09b7588c21ed35e3220 (commit)
      from  004c4ec578dbb7e1f58c0f3876bf87294d6a709e (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 87e2bd3dddd172eb8264ab12202659c18ba09880
Merge: bcb5c07 0b62e85
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 15 16:37:22 2012 -0400

    Merge branch 'master' into next
    
    Fixing some conflicts due to cherry-pick on master.
    
    Conflicts:
        gr-digital/grc/digital_constellation_receiver_cb.xml
        gr-digital/lib/digital_constellation_receiver_cb.cc

commit bcb5c077d3cd0cac072670667fe6cf18244b9efe
Merge: 004c4ec 28c0786
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 15 16:34:51 2012 -0400

    Merge remote-tracking branch 'benreynwar/next_constellation_scale' into next

commit 28c0786bccd2069c9b34dad6968544875af47567
Author: Ben Reynwar <address@hidden>
Date:   Sun Sep 30 21:27:34 2012 -0700

    digital: Add symbol output to constellation_receiver block for debugging.

commit d4c91c146f50059eca1ccab9bb5a9f96fbe31c42
Merge: 35e508c 33d9cf8
Author: Ben Reynwar <address@hidden>
Date:   Sun Sep 30 20:48:42 2012 -0700

    digital: merge in QAM bug fix from master

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

Summary of changes:
 .../grc/digital_constellation_receiver_cb.xml      |   20 ++++++++++++++++++++
 gr-digital/include/digital/constellation.h         |    3 +++
 gr-digital/lib/constellation.cc                    |   15 ++++++++++++++-
 gr-digital/lib/constellation_receiver_cb_impl.cc   |   11 +++++++----
 4 files changed, 44 insertions(+), 5 deletions(-)


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