[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.
From: |
git version control |
Subject: |
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-796-ga5d65f2 |
Date: |
Thu, 7 Mar 2013 20:08:29 +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 a5d65f2cb6ea5060daa92062c88f3e0d2158b23f (commit)
via 7c79e56792570ffd4e0a17071a3ca7513d63baec (commit)
via 3b0b3b6cf4c08d305df96f96a91d621e3e6232bb (commit)
via 7ebec8cc4b5e3a9eb480e3f954f9425d92e73a18 (commit)
from 192e080ef74b6da5dc15c02159677a3bbf2dbb72 (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 a5d65f2cb6ea5060daa92062c88f3e0d2158b23f
Merge: 192e080 7c79e56
Author: Tom Rondeau <address@hidden>
Date: Thu Mar 7 14:29:02 2013 -0500
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
-----------------------------------------------------------------------
Summary of changes:
gnuradio-core/gnuradio-core.conf.in | 5 ++++
gnuradio-core/src/lib/runtime/gr_basic_block.h | 23 +++++++++++++++++--
.../src/lib/runtime/gr_tpb_thread_body.cc | 17 +++++++++++++-
gr-blocks/python/qa_pdu.py | 3 +-
4 files changed, 42 insertions(+), 6 deletions(-)
hooks/post-receive
--
git://gnuradio.org/gnuradio
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-796-ga5d65f2,
git version control <=