[Commit-gnuradio] [gnuradio] 12/16: Merge remote-tracking branch 'tom/ctrlport/fixes1'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit c754032fbf4bfe79f8ca30c42e284f79b014acf8
Merge: 9429203 0c3e5e1
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 26 15:41:54 2015 -0700

    Merge remote-tracking branch 'tom/ctrlport/fixes1'

 .../python/gnuradio/ctrlport/gr-perf-monitorx      | 143 ++++++++++++---------
 gr-blocks/lib/ctrlport_probe2_b_impl.cc            |  30 +++--
 gr-blocks/lib/ctrlport_probe2_b_impl.h             |   2 +-
 gr-blocks/lib/ctrlport_probe2_c_impl.cc            |  30 +++--
 gr-blocks/lib/ctrlport_probe2_c_impl.h             |   1 +
 gr-blocks/lib/ctrlport_probe2_f_impl.cc            |  31 +++--
 gr-blocks/lib/ctrlport_probe2_f_impl.h             |   1 +
 gr-blocks/lib/ctrlport_probe2_i_impl.cc            |  31 +++--
 gr-blocks/lib/ctrlport_probe2_i_impl.h             |   1 +
 gr-blocks/lib/ctrlport_probe2_s_impl.cc            |  27 ++--
 gr-blocks/lib/ctrlport_probe2_s_impl.h             |   1 +
 11 files changed, 175 insertions(+), 123 deletions(-)