[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, 27 May 2015 16:59:47 +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 7cbbe1d5fc326ea3f59615c95bc69dbcfda00824
Merge: ef544fa fb064e3
Author: Johnathan Corgan <address@hidden>
Date: Wed May 27 09:48:26 2015 -0700
Merge branch 'master' into next
gr-analog/examples/CMakeLists.txt | 7 +
gr-analog/examples/noise_power.grc | 1675 ++++++++++++++++++++
.../include/gnuradio/analog/fastnoise_source_X.h.t | 23 +-
.../include/gnuradio/analog/noise_source_X.h.t | 23 +-
gr-analog/lib/fastnoise_source_X_impl.cc.t | 9 +-
gr-analog/lib/noise_source_X_impl.cc.t | 9 +-
gr-digital/lib/corr_est_cc_impl.cc | 2 +-
gr-digital/lib/msk_timing_recovery_cc_impl.cc | 2 +-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc | 2 +-
gr-fec/lib/gf2mat.cc | 4 +-
gr-qtgui/lib/vector_sink_f_impl.cc | 4 +-
gr-uhd/lib/usrp_block_impl.cc | 2 +-
gr-utils/python/modtool/util_functions.py | 13 +-
13 files changed, 1754 insertions(+), 21 deletions(-)