[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. v3.3.1git-18-gf92f8aa

[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, master has been updated
       via  f92f8aae6746fa8fad1d6721fe1a8583295b38e1 (commit)
       via  4c8cda27d86d400e60358f6ad342827bab9d3fdc (commit)
      from  f108f96074a7699f87d80dbd1a5bbc7c2170d1db (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 f92f8aae6746fa8fad1d6721fe1a8583295b38e1
Merge: f108f96074a7699f87d80dbd1a5bbc7c2170d1db 
4c8cda27d86d400e60358f6ad342827bab9d3fdc
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 22 06:53:16 2010 -0700

    Merge branch 'patches/marcus/gr_and_const'
    
    * patches/marcus/gr_and_const:
      grc: adds gr.and_const to block tree

commit 4c8cda27d86d400e60358f6ad342827bab9d3fdc
Author: Marcus D Leech <address@hidden>
Date:   Sun May 16 08:16:39 2010 -0700

    grc: adds gr.and_const to block tree

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

Summary of changes:
 grc/blocks/Makefile.am                           |    1 +
 grc/blocks/block_tree.xml                        |    1 +
 grc/blocks/{gr_or_xx.xml => gr_and_const_xx.xml} |   18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)
 copy grc/blocks/{gr_or_xx.xml => gr_and_const_xx.xml} (72%)


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