[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a411404005f3c24c8df51b68946e2cfd69e38d63
Merge: 065b0ad afadc5c
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 24 17:07:06 2016 -0700

    Merge branch 'maint'

 gr-filter/lib/pfb_arb_resampler_ccc_impl.cc |  1 -
 gr-filter/lib/pfb_arb_resampler_ccf_impl.cc |  1 -
 gr-filter/lib/pfb_arb_resampler_fff_impl.cc |  1 -
 grc/gui/ActionHandler.py                    |  8 +++++---
 grc/gui/Block.py                            | 15 +++++++--------
 grc/gui/Constants.py                        |  2 ++
 grc/gui/FlowGraph.py                        |  2 +-
 grc/gui/PropsDialog.py                      |  5 +++--
 grc/gui/Utils.py                            |  7 ++++++-
 9 files changed, 24 insertions(+), 18 deletions(-)