[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4.1-933-ga8770d2

[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  a8770d2d605e7a9e767f5d08d5c1610e107b7ac3 (commit)
       via  50d9b3282ae65b7cf6bf007ab8f32b4ae7cc3ed1 (commit)
      from  806ae9368dd55ba6a464558e9cbf1e323020b583 (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 a8770d2d605e7a9e767f5d08d5c1610e107b7ac3
Merge: 806ae93 50d9b32
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 19 14:31:21 2013 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-wxgui/python/fftsink_nongl.py
        gr-wxgui/python/waterfallsink_nongl.py

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

Summary of changes:
 gr-wxgui/python/fftsink_nongl.py       |    2 ++
 gr-wxgui/python/waterfallsink_nongl.py |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)


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