[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.3.1git-65-g36389a6

[git repository hosting]

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  36389a6f6c5c84599757a140c83e59372f0350c9 (commit)
       via  ec8ef957565226ec98830192544d7d5da68dbe23 (commit)
       via  f92f8aae6746fa8fad1d6721fe1a8583295b38e1 (commit)
       via  f23a2b33ca1bebf0c3a5fa26fdcff11827744b77 (commit)
       via  4c8cda27d86d400e60358f6ad342827bab9d3fdc (commit)
      from  76eabccf014dfd1a055f2797179e3a4c0fe21d37 (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 36389a6f6c5c84599757a140c83e59372f0350c9
Merge: 76eabccf014dfd1a055f2797179e3a4c0fe21d37 
ec8ef957565226ec98830192544d7d5da68dbe23
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 22 07:45:21 2010 -0700

    Merge branch 'master' into next

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

Summary of changes:
 gnuradio-core/src/lib/general/gri_fft.cc         |    8 ++++++--
 grc/blocks/Makefile.am                           |    1 +
 grc/blocks/block_tree.xml                        |    1 +
 grc/blocks/{gr_or_xx.xml => gr_and_const_xx.xml} |   18 +++++++++---------
 4 files changed, 17 insertions(+), 11 deletions(-)
 copy grc/blocks/{gr_or_xx.xml => gr_and_const_xx.xml} (72%)


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