[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnuradio-commit
Subject:    [Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. v3.6.2-184-g61b9944
From:       git () gnuradio ! org (git version control)
Date:       2012-11-28 2:01:34
Message-ID: 20121128020135.973ED10107 () shannon ! gnuradio ! org
[Download RAW message or body]

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  61b99449eeaaebe5ccc10758549add9c9e23f710 (commit)
      from  c941e8f5f22c3911ba36b72478794ff47ee679a7 (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 61b99449eeaaebe5ccc10758549add9c9e23f710
Author: Tom Rondeau <trondeau@vt.edu>
Date:   Tue Nov 27 17:18:28 2012 -0800

    Revert "Revert "Merge remote branch 'jblum-github/python_blocks2' into master""
    
    This reverts commit 3a142bebafdc018bccc80cf124a375b53db03581.
    
    Since updating __init__.py for ticket 181, we should have fixed the same bug that \
was being seen here.  
    Conflicts:
    
    	gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt

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

Summary of changes:
 gnuradio-core/CMakeLists.txt                       |    4 +-
 gnuradio-core/src/lib/general/CMakeLists.txt       |    1 +
 gnuradio-core/src/lib/general/general.i            |    3 +-
 gnuradio-core/src/lib/general/gr_block_gateway.cc  |  184 +++++++++++++++
 gnuradio-core/src/lib/general/gr_block_gateway.h   |  212 ++++++++++++++++++
 .../src/lib/general/gr_block_gateway.i             |   28 +--
 .../src/python/gnuradio/gr/CMakeLists.txt          |    8 +
 gnuradio-core/src/python/gnuradio/gr/__init__.py   |    3 +-
 gnuradio-core/src/python/gnuradio/gr/gateway.py    |  215 ++++++++++++++++++
 .../src/python/gnuradio/gr/qa_block_gateway.py     |  235 ++++++++++++++++++++
 10 files changed, 874 insertions(+), 19 deletions(-)
 create mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.cc
 create mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.h
 copy gr-audio/swig/audio_swig.i => gnuradio-core/src/lib/general/gr_block_gateway.i \
(72%)  create mode 100644 gnuradio-core/src/python/gnuradio/gr/gateway.py
 create mode 100644 gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py


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


[prev in list] [next in list] [prev in thread] [next in thread]