[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] branch next updated (4d353a0 -> c8d54be)
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] branch next updated (4d353a0 -> c8d54be) |
Date: |
Mon, 31 Mar 2014 18:35:03 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a change to branch next
in repository gnuradio.
from 4d353a0 Merge branch 'master' into next
new 1da5346 blocks: refactored stream_mux to be more flexible with
buffer sizes
new 1138fa7 Merge remote-tracking branch 'martin/blocks/stream_mux'
new dee85a7 Use VERBATIM in custom commands to fix quoting, to make
CMake happy with the Python command being issued
new 0844b31 Merge remote-tracking branch
'michaelld/fix_Wno_dev_warnings' into maint
new a8f73d8 Merge branch 'maint'
new c8d54be Merge branch 'master' into next
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
cmake/Modules/GrPython.cmake | 3 +-
gnuradio-runtime/lib/pmt/CMakeLists.txt | 3 +-
gr-blocks/lib/stream_mux_impl.cc | 115 ++++++++++++++-----------------
gr-blocks/lib/stream_mux_impl.h | 6 +-
gr-blocks/python/blocks/qa_stream_mux.py | 16 ++++-
volk/cmake/GrPython.cmake | 3 +-
6 files changed, 75 insertions(+), 71 deletions(-)
- [Commit-gnuradio] [gnuradio] branch next updated (4d353a0 -> c8d54be),
git <=