[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'sbmuel
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'sbmueller/deprecation_3.8' |
|
Date: |
Thu, 15 Sep 2016 21:58:35 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 95ccf0b099f88d0e3b97f7025743091c42cb90d3
Merge: 98fcf63 6d693dc
Author: Johnathan Corgan <address@hidden>
Date: Thu Sep 15 14:30:13 2016 -0700
Merge remote-tracking branch 'sbmueller/deprecation_3.8'
gr-analog/grc/analog_block_tree.xml | 1 -
gr-analog/grc/analog_cpfsk_bc.xml | 1 +
gr-analog/include/gnuradio/analog/cpfsk_bc.h | 1 +
gr-digital/grc/digital_block_tree.xml | 6 ------
gr-digital/grc/digital_dxpsk_demod.xml | 1 +
gr-digital/grc/digital_dxpsk_mod.xml | 1 +
gr-digital/grc/digital_mpsk_receiver_cc.xml | 1 +
gr-digital/grc/digital_psk_demod.xml | 1 +
gr-digital/grc/digital_psk_mod.xml | 1 +
gr-digital/grc/digital_qam_demod.xml | 1 +
gr-digital/grc/digital_qam_mod.xml | 1 +
gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h | 1 +
12 files changed, 10 insertions(+), 7 deletions(-)