[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.1git-97-g012143e

[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  012143e44d9dcfc0e157ee9bd564653fa19eada9 (commit)
       via  ed838eb9be22d769247a9c63f23423c8c2f81f72 (commit)
      from  b0b1f5139a748c5c4fe985feab17e2c0fd05ae11 (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 012143e44d9dcfc0e157ee9bd564653fa19eada9
Merge: b0b1f51 ed838eb
Author: Tom Rondeau <address@hidden>
Date:   Mon May 21 14:36:24 2012 -0400

    Merge branch 'master' into next

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

Summary of changes:
 gr-wxgui/grc/wxgui_fftsink2.xml                  |   12 ++++++++++++
 gr-wxgui/grc/wxgui_waterfallsink2.xml            |   12 ++++++++++++
 gr-wxgui/src/python/fft_window.py                |    2 ++
 gr-wxgui/src/python/fftsink_gl.py                |    3 +++
 gr-wxgui/src/python/plotter/channel_plotter.py   |    8 ++++++++
 gr-wxgui/src/python/plotter/common.py            |    1 +
 gr-wxgui/src/python/plotter/grid_plotter_base.py |   14 +++++++++++++-
 gr-wxgui/src/python/plotter/plotter_base.py      |    5 ++++-
 gr-wxgui/src/python/plotter/waterfall_plotter.py |    8 ++++++++
 gr-wxgui/src/python/waterfall_window.py          |    3 +++
 gr-wxgui/src/python/waterfallsink_gl.py          |    3 +++
 11 files changed, 69 insertions(+), 2 deletions(-)


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