[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] branch master updated (6168622 -> 7fe6115)
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] branch master updated (6168622 -> 7fe6115) |
Date: |
Wed, 1 Apr 2015 13:00:34 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a change to branch master
in repository gnuradio.
from 6168622 Merge remote-tracking branch 'michaelld/volk_fixes'
new 3cf1d10 digital: mm clock recovery - fix clipping w/ 2nd output
new 86353a4 Merge branch 'maint'
new d7d7ab7 blocks: add blocks_stream_align to support acquiring
alignment to TSB from an unaligned TSB stream
new 3cd98be blocks: fix tagged_stream_align min/max output items
new 04e34d6 Merge remote-tracking branch 'osh/tsb_align'
new 9aa89ae modtool: update manifest based on CGRAN meeting
new 89387b6 Merge remote-tracking branch 'nwest/cgran_meeting'
new 67e7004 qtgui: fixed issue with QWT 6 and 6.1 changes.
new 7fe6115 Merge remote-tracking branch
'tom/qtgui/timedisplayform_qwt_fix'
The 9 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:
gr-blocks/grc/blocks_block_tree.xml | 1 +
...y_length.xml => blocks_tagged_stream_align.xml} | 19 +----
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
...tterned_interleaver.h => tagged_stream_align.h} | 31 ++++----
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/tagged_stream_align_impl.cc | 86 ++++++++++++++++++++++
...{skiphead_impl.h => tagged_stream_align_impl.h} | 31 ++++----
gr-blocks/swig/blocks_swig5.i | 3 +
gr-digital/lib/clock_recovery_mm_cc_impl.cc | 2 +-
gr-qtgui/lib/timedisplayform.cc | 68 +++++++++++++++++
gr-utils/python/modtool/gr-newmod/MANIFEST.md | 4 +-
11 files changed, 199 insertions(+), 48 deletions(-)
copy gr-blocks/grc/{blocks_tagged_stream_multiply_length.xml =>
blocks_tagged_stream_align.xml} (70%)
copy gr-blocks/include/gnuradio/blocks/{patterned_interleaver.h =>
tagged_stream_align.h} (59%)
create mode 100644 gr-blocks/lib/tagged_stream_align_impl.cc
copy gr-blocks/lib/{skiphead_impl.h => tagged_stream_align_impl.h} (65%)
- [Commit-gnuradio] [gnuradio] branch master updated (6168622 -> 7fe6115),
git <=
- [Commit-gnuradio] [gnuradio] 01/08: blocks: add blocks_stream_align to support acquiring alignment to TSB from an unaligned TSB stream, git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 04/08: qtgui: fixed issue with QWT 6 and 6.1 changes., git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 05/08: Merge branch 'maint', git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 03/08: modtool: update manifest based on CGRAN meeting, git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'tom/qtgui/timedisplayform_qwt_fix', git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 02/08: blocks: fix tagged_stream_align min/max output items, git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'osh/tsb_align', git, 2015/04/01
- [Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'nwest/cgran_meeting', git, 2015/04/01