[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'stefan
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'stefanolt/master' |
|
Date: |
Fri, 31 Oct 2014 20:00:17 +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 d3afc86ab5fa17050e495122ea58b1bbfe4889a2
Merge: f7322ac 4fe0545
Author: Johnathan Corgan <address@hidden>
Date: Fri Oct 31 12:31:57 2014 -0700
Merge remote-tracking branch 'stefanolt/master'
gr-analog/grc/analog_probe_avg_mag_sqrd_x.xml | 1 +
gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h | 1 +
gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h | 1 +
gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h | 1 +
gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc | 6 ++++++
gr-analog/lib/probe_avg_mag_sqrd_c_impl.h | 1 +
gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc | 6 ++++++
gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h | 1 +
gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc | 6 ++++++
gr-analog/lib/probe_avg_mag_sqrd_f_impl.h | 1 +
10 files changed, 25 insertions(+)