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

List:       gnuradio-commit
Subject:    [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-546-ge592990
From:       git () gnuradio ! org (git version control)
Date:       2012-11-28 2:18:26
Message-ID: 20121128021827.553DB10124 () 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, next has been updated
       via  e5929906700f3d6fa474fc5d9a8650b1fafbc2a1 (commit)
       via  61b99449eeaaebe5ccc10758549add9c9e23f710 (commit)
      from  626fb35ea298509f6ffa403d4abb20c6516f746c (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 e5929906700f3d6fa474fc5d9a8650b1fafbc2a1
Merge: 626fb35 61b9944
Author: Tom Rondeau <trondeau@vt.edu>
Date:   Tue Nov 27 18:19:04 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
    	gnuradio-core/src/lib/general/CMakeLists.txt
    	gnuradio-core/src/lib/general/general.i

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

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]