[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'tom/filter_design_pyqt4' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 65ab4929dad317edd18208fbb6deb1e54e89eaf0
Merge: 7ccbd33 913fb50
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 28 17:38:41 2015 -0700

    Merge remote-tracking branch 'tom/filter_design_pyqt4' into maint

 gr-filter/python/filter/design/filter_design.py | 2 +-
 gr-filter/python/filter/gui/polezero_plot.py    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)