[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 1 Apr 2015 13:00:36 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit c6b430aec86325991239b0378a74eba508d0f0a7
Merge: eae2f63 7fe6115
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 1 05:52:05 2015 -0700
Merge branch 'master' into next
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_tagged_stream_align.xml | 59 +++++++++++++++
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
.../include/gnuradio/blocks/tagged_stream_align.h | 55 ++++++++++++++
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/tagged_stream_align_impl.cc | 86 ++++++++++++++++++++++
gr-blocks/lib/tagged_stream_align_impl.h | 53 +++++++++++++
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, 329 insertions(+), 4 deletions(-)