[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 7bc590e988b9fc2bcb42ffcd12a89dd22e8ac4b9
Merge: 89d0241 dcfe047
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 31 12:54:27 2014 -0700

    Merge branch 'master' into next

 README                                                    | 4 ++--
 README.building-boost                                     | 4 ++--
 README.hacking                                            | 6 +++---
 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 +
 volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h         | 6 ++----
 volk/kernels/volk/volk_32fc_deinterleave_imag_32f.h       | 4 +---
 15 files changed, 35 insertions(+), 14 deletions(-)