[Commit-gnuradio] [gnuradio] 05/08: Merge remote-tracking branch 'kartikp/time_sink_grc_syntax' 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 eaf69fc226db9526e5cc4dfce59abef34283eeca
Merge: 509330c 2006a72
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 26 04:24:30 2017 -0800

    Merge remote-tracking branch 'kartikp/time_sink_grc_syntax' into maint

 gr-qtgui/grc/qtgui_time_sink_x.xml | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)