[Commit-gnuradio] [gnuradio] 02/03: 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 d0afc2f7e08f3024b4a5a67573201a6707df5805
Merge: b44e38c d1a5dbf
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 23 06:04:21 2017 -0700

    Merge branch 'maint'

 gr-analog/include/gnuradio/analog/frequency_modulator_fc.h |  2 +-
 gr-qtgui/lib/time_sink_c_impl.cc                           | 13 ++++++++-----
 gr-qtgui/lib/time_sink_f_impl.cc                           | 13 ++++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)