[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/09: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 07/09: Merge branch 'master' into next |
Date: |
Sat, 6 Aug 2016 22:28: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 f82585ca247d52a6142963d9e903f6c4e07c5a79
Merge: 675afc0 440da17
Author: Johnathan Corgan <address@hidden>
Date: Sat Aug 6 15:09:12 2016 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/attributes.h | 8 +++----
.../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc | 10 ++++----
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc | 8 ++++---
gr-filter/grc/filter_fractional_resampler_xx.xml | 7 +++++-
.../gnuradio/filter/fractional_resampler_cc.h | 5 ++++
.../gnuradio/filter/fractional_resampler_ff.h | 6 +++++
gr-filter/lib/fractional_resampler_cc_impl.cc | 26 +++++++++++++++++++++
gr-filter/lib/fractional_resampler_cc_impl.h | 2 ++
gr-filter/lib/fractional_resampler_ff_impl.cc | 27 ++++++++++++++++++++++
gr-filter/lib/fractional_resampler_ff_impl.h | 2 ++
10 files changed, 88 insertions(+), 13 deletions(-)
- [Commit-gnuradio] [gnuradio] branch next updated (675afc0 -> fc1a6a8), git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 03/09: runtime: expose set_log_level for hier_blocks, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 07/09: Merge branch 'master' into next,
git <=
- [Commit-gnuradio] [gnuradio] 09/09: Merge remote-tracking branch 'pinkavaj/argparse-utils-04-b' into next, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 05/09: blocks: add QA for new block log_level accessors, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 01/09: runtime: expose set_log_level for blocks, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 02/09: runtime: add documentation for block set_log_level, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 08/09: Merge remote-tracking branch 'nwest/block-log_set_level' into next, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 04/09: runtime: add interface to get log_level for blocks, git, 2016/08/06
- [Commit-gnuradio] [gnuradio] 06/09: filter: replace OptionParser by ArgumentParser for gr-utils and gr-qtgui, git, 2016/08/06