[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6
From: |
git version control |
Subject: |
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-199-g342a400 |
Date: |
Sun, 1 Jul 2012 23:33:01 +0000 (UTC) |
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 342a400b754f3ccd306938f83ccfcb285411ba18 (commit)
via f8581fb475267e1a97eaab962e423559fb4bfce2 (commit)
via 045d02d1a69c916e60d87b655adfacfceeceeaaf (commit)
via 30ea41c48215af4c50049aefb4ff0e59f14decfe (commit)
from e9c33226844aa517503571ce79f6724287580f48 (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 342a400b754f3ccd306938f83ccfcb285411ba18
Merge: e9c3322 f8581fb
Author: Johnathan Corgan <address@hidden>
Date: Sun Jul 1 16:26:57 2012 -0700
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/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 | 3 +
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, 869 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 Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-199-g342a400,
git version control <=